PR: manual merge from BR_3_0_0_OCC

diff --git a/INSTALL b/INSTALL
index 85d9ec8a2902457bbfa0f5daa4954e33cc8afad9..33e3a6454e8b39c2cc8e8dd932ecca9a32fe8d19 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,6 @@
-This is the version 3.0.0 of KERNEL
+This is the version 3.1.0a of KERNEL
 Previous versions :
+        - 3.0.0
         - 2.2.4
         - 2.2.3
        - 2.2.2

diff --git a/bin/VERSION b/bin/VERSION
index 2055a012463d362f4313e5a7bf56d00f7d9878f9..21cff5ac02751d68622c6c7bcf4e8643d55422e4 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - KERNEL VERSION: 3.0.2
+THIS IS SALOME - KERNEL VERSION: 3.1.0a

diff --git a/resources/CatalogResources.xml b/resources/CatalogResources.xml
index 3f8689ac2551f6a0972766d023785ca2781a4028..f83a16243be7125e12b6abea478a253cad71d475 100644 (file)
--- a/resources/CatalogResources.xml
+++ b/resources/CatalogResources.xml
@@ -3,44 +3,44 @@
 
 <machine hostname="is111790" OS="LINUX" CPUFreqMHz="2992" memInMB="1024" protocol="r" mode="i" nbOfNodes="1" nbOfProcPerNode="1" preReqFilePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL/salome.sh" >
 <modules modulePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL" moduleName="KERNEL" />
-<modules modulePath="/export/home/LGLS/Products/MED_3.0.0" moduleName="MED" />
-<modules modulePath="/export/home/LGLS/Products/GEOM_3.0.0" moduleName="GEOM" />
-<modules modulePath="/export/home/LGLS/Products/SMESH_3.0.0" moduleName="SMESH" />
-<modules modulePath="/export/home/LGLS/Products/SUPERV_3.0.0" moduleName="SUPERV" />
-<modules modulePath="/export/home/LGLS/Products/VISU_3.0.0" moduleName="VISU" />
+<modules modulePath="/export/home/LGLS/Products/MED_3.1.0a" moduleName="MED" />
+<modules modulePath="/export/home/LGLS/Products/GEOM_3.1.0a" moduleName="GEOM" />
+<modules modulePath="/export/home/LGLS/Products/SMESH_3.1.0a" moduleName="SMESH" />
+<modules modulePath="/export/home/LGLS/Products/SUPERV_3.1.0a" moduleName="SUPERV" />
+<modules modulePath="/export/home/LGLS/Products/VISU_3.1.0a" moduleName="VISU" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYCOMPO_INSTALL" moduleName="MYCOMPO" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYMPICOMPO_INSTALL" moduleName="MYMPICOMPO" />
 </machine>
 
 <machine hostname="is111915" OS="LINUX" CPUFreqMHz="2992" memInMB="1024" protocol="r" mode="i" nbOfNodes="1" nbOfProcPerNode="1" preReqFilePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL/salome.sh" >
 <modules modulePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL" moduleName="KERNEL" />
-<modules modulePath="/export/home/LGLS/Products/MED_3.0.0" moduleName="MED" />
-<modules modulePath="/export/home/LGLS/Products/GEOM_3.0.0" moduleName="GEOM" />
-<modules modulePath="/export/home/LGLS/Products/SMESH_3.0.0" moduleName="SMESH" />
-<modules modulePath="/export/home/LGLS/Products/SUPERV_3.0.0" moduleName="SUPERV" />
-<modules modulePath="/export/home/LGLS/Products/VISU_3.0.0" moduleName="VISU" />
+<modules modulePath="/export/home/LGLS/Products/MED_3.1.0a" moduleName="MED" />
+<modules modulePath="/export/home/LGLS/Products/GEOM_3.1.0a" moduleName="GEOM" />
+<modules modulePath="/export/home/LGLS/Products/SMESH_3.1.0a" moduleName="SMESH" />
+<modules modulePath="/export/home/LGLS/Products/SUPERV_3.1.0a" moduleName="SUPERV" />
+<modules modulePath="/export/home/LGLS/Products/VISU_3.1.0a" moduleName="VISU" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYCOMPO_INSTALL" moduleName="MYCOMPO" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYMPICOMPO_INSTALL" moduleName="MYMPICOMPO" />
 </machine>
 
 <machine hostname="is111918" OS="LINUX" CPUFreqMHz="2992" memInMB="1024" protocol="r" mode="i" nbOfNodes="1" nbOfProcPerNode="1" preReqFilePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL/salome.sh" >
 <modules modulePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL" moduleName="KERNEL" />
-<modules modulePath="/export/home/LGLS/Products/MED_3.0.0" moduleName="MED" />
-<modules modulePath="/export/home/LGLS/Products/GEOM_3.0.0" moduleName="GEOM" />
-<modules modulePath="/export/home/LGLS/Products/SMESH_3.0.0" moduleName="SMESH" />
-<modules modulePath="/export/home/LGLS/Products/SUPERV_3.0.0" moduleName="SUPERV" />
-<modules modulePath="/export/home/LGLS/Products/VISU_3.0.0" moduleName="VISU" />
+<modules modulePath="/export/home/LGLS/Products/MED_3.1.0a" moduleName="MED" />
+<modules modulePath="/export/home/LGLS/Products/GEOM_3.1.0a" moduleName="GEOM" />
+<modules modulePath="/export/home/LGLS/Products/SMESH_3.1.0a" moduleName="SMESH" />
+<modules modulePath="/export/home/LGLS/Products/SUPERV_3.1.0a" moduleName="SUPERV" />
+<modules modulePath="/export/home/LGLS/Products/VISU_3.1.0a" moduleName="VISU" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYCOMPO_INSTALL" moduleName="MYCOMPO" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYMPICOMPO_INSTALL" moduleName="MYMPICOMPO" />
 </machine>
 
 <machine hostname="is111996" OS="LINUX" CPUFreqMHz="2992" memInMB="1024" protocol="r" mode="i" nbOfNodes="1" nbOfProcPerNode="1" preReqFilePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL/salome.sh" >
 <modules modulePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL" moduleName="KERNEL" />
-<modules modulePath="/export/home/LGLS/Products/MED_3.0.0" moduleName="MED" />
-<modules modulePath="/export/home/LGLS/Products/GEOM_3.0.0" moduleName="GEOM" />
-<modules modulePath="/export/home/LGLS/Products/SMESH_3.0.0" moduleName="SMESH" />
-<modules modulePath="/export/home/LGLS/Products/SUPERV_3.0.0" moduleName="SUPERV" />
-<modules modulePath="/export/home/LGLS/Products/VISU_3.0.0" moduleName="VISU" />
+<modules modulePath="/export/home/LGLS/Products/MED_3.1.0a" moduleName="MED" />
+<modules modulePath="/export/home/LGLS/Products/GEOM_3.1.0a" moduleName="GEOM" />
+<modules modulePath="/export/home/LGLS/Products/SMESH_3.1.0a" moduleName="SMESH" />
+<modules modulePath="/export/home/LGLS/Products/SUPERV_3.1.0a" moduleName="SUPERV" />
+<modules modulePath="/export/home/LGLS/Products/VISU_3.1.0a" moduleName="VISU" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYCOMPO_INSTALL" moduleName="MYCOMPO" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYMPICOMPO_INSTALL" moduleName="MYMPICOMPO" />
 </machine>

diff --git a/resources/KERNELCatalog.xml b/resources/KERNELCatalog.xml
index 7b837d118c66361a2021067092f49e190a4f4481..298eadd2df489eda006a0447bae226af06a7f7df 100644 (file)
--- a/resources/KERNELCatalog.xml
+++ b/resources/KERNELCatalog.xml
@@ -16,7 +16,7 @@
                <component-username>Salome</component-username>
                <component-type>Other</component-type>
                <component-author>NRI</component-author>
-               <component-version>3.0.0</component-version>
+               <component-version>3.1.0a</component-version>
                <component-comment>GUI Neutral Context</component-comment>
                <component-multistudy>1</component-multistudy>
 
@@ -27,7 +27,7 @@
                <component-username>SalomeTestComponent</component-username>
                <component-type>Other</component-type>
                <component-author>NRI</component-author>
-               <component-version>3.0.0</component-version>
+               <component-version>3.1.0a</component-version>
                <component-comment>GUI Neutral Context</component-comment>
                <component-multistudy>1</component-multistudy>
                <constraint>'linux' ~ OS</constraint>
@@ -37,7 +37,7 @@
                <component-username>SALOME_TestComponentPy</component-username>
                <component-type>Other</component-type>
                <component-author>NRI</component-author>
-               <component-version>3.0.0</component-version>
+               <component-version>3.1.0a</component-version>
                <component-comment>GUI Neutral Context</component-comment>
                <component-multistudy>1</component-multistudy>
                <constraint>'linux' ~ OS</constraint>

diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
index 007274fd4688f3cf30b2936aa2e5a261465847e5..a020990f53e7b05b578c99ef4d6038bd74a44b99 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
@@ -208,7 +208,7 @@ SALOMEDS::GenericAttribute_ptr SALOMEDS_StudyBuilder_i::FindOrCreateAttribute(SA
   Handle(SALOMEDSImpl_SObject) aSO;
   char* anID = anObject->GetID();  
   aSO = Handle(SALOMEDSImpl_Study)::DownCast(_impl->GetOwner())->GetSObject(anID);
-  delete anID;
+  delete [] anID;
   Handle(TDF_Attribute) anAttr;
   try {
      anAttr = _impl->FindOrCreateAttribute(aSO, TCollection_AsciiString((char*)aTypeOfAttribute));