Merge with version on tag OCC-V2_1_0d

diff --git a/INSTALL b/INSTALL
index 53808c6a778e4bdf151c888e9b466fd88d0a1dba..c504dbab8dbcb890970229525f4aba83864e36ee 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,3 @@
-This is the version 2.0.1 of MED
+This is the version 2.1.0 of MED
 Compatible with :
-       - KERNEL 2.0.0 with AG addings becarefull
+       - KERNEL 2.1.0

diff --git a/bin/VERSION b/bin/VERSION
index bebf48fa8424bbeb605b149daabcc53d153c1238..339cb860cefe6cb5d49e35b3f736860b1f783266 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - MED VERSION: 2.0.0
+THIS IS SALOME - MED VERSION: 2.1.0

diff --git a/doc/salome/tui/MED/HTML/MED.html b/doc/salome/tui/MED/HTML/MED.html
index b8f484aded3b0d24cae2817f3d5dfdfb99eab310..8b1abaeb1fa3f202a2805e32423267ab38389f04 100644 (file)
--- a/doc/salome/tui/MED/HTML/MED.html
+++ b/doc/salome/tui/MED/HTML/MED.html
@@ -19,8 +19,16 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getMeshDimension (  )</b></div></td>
 </tr>
 <tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  getCoordinateSystem (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinateSystem (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>boolean  getIsAGrid (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getIsAGrid (  )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>boolean  existConnectivity ( in medConnectivity mode, in medEntityMesh entity )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = existConnectivity ( mode, entity )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>string  getCoordinatesSystem (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinatesSystem (  )</b></div></td>
 </tr>
 <tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfNodes (  )</b></div></td>
@@ -31,6 +39,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinates ( typeSwitch )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>double  getCoordinate ( in long Number, in long Axis )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinate ( Number, Axis )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>string_array  getCoordinatesNames (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinatesNames (  )</b></div></td>
 </tr>
@@ -39,6 +51,22 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinatesUnits (  )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>SUPPORT  getBoundaryElements ( in medEntityMesh Entity )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getBoundaryElements ( Entity )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>SUPPORT  getSkin ( in SUPPORT mySupport3D )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getSkin ( mySupport3D )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long_array  getGlobalNumberingIndex ( in medEntityMesh entity )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getGlobalNumberingIndex ( entity )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>coordinateInfos  getCoordGlobal (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordGlobal (  )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfTypes ( in medEntityMesh entity )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfTypes ( entity )</b></div></td>
 </tr>
@@ -63,6 +91,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getElementNumber ( mode, entity, type, connectivity )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>medGeometryElement  getElementType ( in medEntityMesh entity, in long number )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getElementType ( entity, number )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long_array  getReverseConnectivity ( in medConnectivity mode )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getReverseConnectivity ( mode )</b></div></td>
 </tr>
@@ -71,6 +103,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getReverseConnectivityIndex ( mode )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>connectivityInfos  getConnectGlobal ( in medEntityMesh entity )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getConnectGlobal ( entity )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfFamilies ( in medEntityMesh entity )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfFamilies ( entity )</b></div></td>
 </tr>
@@ -138,6 +174,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>long  getCorbaIndex (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCorbaIndex (  )</b></div></td>
 </tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>meshInfos  getMeshGlobal (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getMeshGlobal (  )</b></div></td>
+</tr>
 </table><br>
 <table width="100%" BORDER>
 <tr bgcolor="#FFFFCC">
@@ -171,6 +211,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfElements ( geomElement )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfTypes (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfTypes (  )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>medGeometryElement_array  getTypes (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getTypes (  )</b></div></td>
 </tr>
@@ -183,13 +227,25 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberIndex (  )</b></div></td>
 </tr>
 <tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfGaussPoints ( in medGeometryElement geomElement )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfGaussPoints ( geomElement )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfGaussPoint ( in medGeometryElement geomElement )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfGaussPoint ( geomElement )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long_array  getNumbersOfGaussPoint (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumbersOfGaussPoint (  )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>void getBoundaryElements (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>getBoundaryElements (  )</b></div></td>
 </tr>
 <tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long  getCorbaIndex (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCorbaIndex (  )</b></div></td>
 </tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>supportInfos  getSupportGlobal (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getSupportGlobal (  )</b></div></td>
+</tr>
 </table><br>
 <table width="100%" BORDER>
 <tr bgcolor="#FFFFCC">
@@ -230,6 +286,18 @@
 <td bgcolor= "lightgreen"><div align="center"><b>string  getAttributeDescription ( in long i )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getAttributeDescription ( i )</b></div></td>
 </tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfGroups (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfGroups (  )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>string_array  getGroupsNames (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getGroupsNames (  )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>string  getGroupName ( in long i )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getGroupName ( i )</b></div></td>
+</tr>
 </table><br>
 <table width="100%" BORDER>
 <tr bgcolor="#FFFFCC">
@@ -383,6 +451,18 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getMesh ( fieldPtr )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long  getFieldNumberOfIteration ( in string fieldName )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getFieldNumberOfIteration ( fieldName )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long_array  getFieldIteration ( in string fieldName, in long i )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getFieldIteration ( fieldName, i )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long_array  getFieldIterations ( in string fieldName )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getFieldIterations ( fieldName )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>FIELD  getField ( in string fieldName, in long pasTemps, in long numOrdre )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getField ( fieldName, pasTemps, numOrdre )</b></div></td>
 </tr>

diff --git a/doc/salome/tui/MED/doxyfile b/doc/salome/tui/MED/doxyfile
index cb8f40fbd53afc936449cddeeb9b8bf3a60a9b83..1bba3b632ccff05dc5cb7760728b22d6be60c912 100755 (executable)
--- a/doc/salome/tui/MED/doxyfile
+++ b/doc/salome/tui/MED/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - MED - v.2.0.0"
+PROJECT_NAME           = "SALOME - MED - v.2.1.0"
 PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/doc/salome/tui/MED/sources/static/tree.js b/doc/salome/tui/MED/sources/static/tree.js
index 106210c3554afd8bbbdde6b028a6f818a1f4d2cb..d410052c45e8d38984fb7644d176ae759ce395dc 100755 (executable)
--- a/doc/salome/tui/MED/sources/static/tree.js
+++ b/doc/salome/tui/MED/sources/static/tree.js
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.2.0.0 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.2.1.0 </b>", "", "")
      insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
 
 aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))

diff --git a/resources/MEDCatalog.xml b/resources/MEDCatalog.xml
index 3a0361a7bb6d35515a53a282456c9fdf46a2973e..7581059bdaf0be63cddcaa79b40f4e9c795dead8 100644 (file)
--- a/resources/MEDCatalog.xml
+++ b/resources/MEDCatalog.xml
@@ -16,7 +16,7 @@
                <component-username>Med</component-username>
                <component-type>MESH</component-type>
                <component-author>Patrick GOLDBRONN</component-author>
-               <component-version> 1.0</component-version>
+               <component-version>2.1.0</component-version>
                <component-comment>MED memoire</component-comment>
                <component-multistudy>1</component-multistudy>
                <component-icone>ModuleMed.png</component-icone>

diff --git a/src/MED/Med_Gen_i.cxx b/src/MED/Med_Gen_i.cxx
index 6ca2169a5641aa7e1ccd59f93481c86cf6b1fdce..9622592ad19d5bf7748ab86c7e8a2879b8a18c1b 100755 (executable)
--- a/src/MED/Med_Gen_i.cxx
+++ b/src/MED/Med_Gen_i.cxx
@@ -508,17 +508,18 @@ SALOMEDS::TMPFile* Med_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
 
   SALOMEDS::TMPFile_var aStreamFile;
   // Get a temporary directory to store a file
-  TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):SALOMEDS_Tool::GetTmpDir();
+  TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):(char*)SALOMEDS_Tool::GetTmpDir().c_str();
   // Create a list to store names of created files
   SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames;
   TColStd_SequenceOfAsciiString aFileNames;
 
   CORBA::String_var aSaveStudyName("");
-  if (isMultiFile) aSaveStudyName = strdup(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()));
+  if (isMultiFile) aSaveStudyName = CORBA::string_dup(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()).c_str());
 
   SALOMEDS::SObject_var aMedMeshFather = theComponent->GetStudy()->FindObject("MEDMESH");
   if (!CORBA::is_nil(aMedMeshFather)) {
     SALOMEDS::ChildIterator_var anIter = theComponent->GetStudy()->NewChildIterator(aMedMeshFather);
+    anIter->InitEx(1);
     for(; anIter->More(); anIter->Next()) {
       SALOMEDS::SObject_var aSO = anIter->Value();
       SALOMEDS::GenericAttribute_var anAttr;
@@ -526,7 +527,7 @@ SALOMEDS::TMPFile* Med_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
        CORBA::Object_var myIOR = _orb->string_to_object(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value());
        SALOME_MED::MESH_var myMesh = SALOME_MED::MESH::_narrow(myIOR);
        if (! CORBA::is_nil(myMesh)) {
-         TCollection_AsciiString aName(strdup(aSaveStudyName));
+         TCollection_AsciiString aName(aSaveStudyName);
          aName += "_MEDMESH_";
          aName += myMesh->getName();
          aName += ".med";
@@ -542,6 +543,7 @@ SALOMEDS::TMPFile* Med_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
   SALOMEDS::SObject_var aMedFieldFather = theComponent->GetStudy()->FindObject("MEDFIELD");
   if (!CORBA::is_nil(aMedFieldFather)) {
     SALOMEDS::ChildIterator_var anIter = theComponent->GetStudy()->NewChildIterator(aMedFieldFather);
+    anIter->InitEx(1);  
     for(; anIter->More(); anIter->Next()) {
       SALOMEDS::SObject_var aSO = anIter->Value();
       SALOMEDS::GenericAttribute_var anAttr;
@@ -553,13 +555,13 @@ SALOMEDS::TMPFile* Med_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
          a<< myField->getOrderNumber();
          b<< myField->getIterationNumber();
 
-         TCollection_AsciiString aName(strdup(aSaveStudyName));
+         TCollection_AsciiString aName(aSaveStudyName);
          aName += "_MEDFIELD_";
          aName += myField->getName();
          aName += "_ORDRE_";
-         aName += strdup(a.str().c_str());
+         aName += (char*)(a.str().c_str());
          aName += "_ITER_";
-         aName += strdup(b.str().c_str());
+         aName += (char*)(b.str().c_str());
          aName += ".med";
          MESSAGE("Save mesh with name "<<aName.ToCString());
          long driverId = myField->addDriver(SALOME_MED::MED_DRIVER,(aTmpDir+aName).ToCString(),myField->getName());
@@ -591,17 +593,18 @@ SALOMEDS::TMPFile* Med_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
   
   SALOMEDS::TMPFile_var aStreamFile;
   // Get a temporary directory to store a file
-  TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):SALOMEDS_Tool::GetTmpDir();
+  TCollection_AsciiString aTmpDir = (isMultiFile)?TCollection_AsciiString((char*)theURL):(char*)SALOMEDS_Tool::GetTmpDir().c_str();
   // Create a list to store names of created files
   SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames;
   TColStd_SequenceOfAsciiString aFileNames;
   
   CORBA::String_var aSaveStudyName("");
-  if (isMultiFile) aSaveStudyName = strdup(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()));
+  if (isMultiFile) aSaveStudyName = CORBA::string_dup(SALOMEDS_Tool::GetNameFromPath(theComponent->GetStudy()->URL()).c_str());
   
   SALOMEDS::SObject_var aMedMeshFather = theComponent->GetStudy()->FindObject("MEDMESH");
   if (!CORBA::is_nil(aMedMeshFather)) {
     SALOMEDS::ChildIterator_var anIter = theComponent->GetStudy()->NewChildIterator(aMedMeshFather);
+    anIter->InitEx(1); 
     for(; anIter->More(); anIter->Next()) {
       SALOMEDS::SObject_var aSO = anIter->Value();
       SALOMEDS::GenericAttribute_var anAttr;
@@ -609,14 +612,14 @@ SALOMEDS::TMPFile* Med_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
        CORBA::Object_var myIOR = _orb->string_to_object(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value());
        SALOME_MED::MESH_var myMesh = SALOME_MED::MESH::_narrow(myIOR);
        if (! CORBA::is_nil(myMesh)) {
-         TCollection_AsciiString aName(strdup(aSaveStudyName));
+         TCollection_AsciiString aName(aSaveStudyName);
          aName += "_MEDMESH_";
          aName += myMesh->getName();
          aName += ".med";
          MESSAGE("Save mesh with name "<<aName.ToCString());
          long driverId = myMesh->addDriver(SALOME_MED::MED_DRIVER,(aTmpDir+aName).ToCString(),myMesh->getName());
          myMesh->write(driverId,"");
-         HDFascii::ConvertFromHDFToASCII(strdup((aTmpDir+aName).ToCString()), true);
+         HDFascii::ConvertFromHDFToASCII((aTmpDir+aName).ToCString(), true);
          aFileNames.Append(aName);
        }
       }
@@ -626,6 +629,7 @@ SALOMEDS::TMPFile* Med_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
   SALOMEDS::SObject_var aMedFieldFather = theComponent->GetStudy()->FindObject("MEDFIELD");
   if (!CORBA::is_nil(aMedFieldFather)) {
     SALOMEDS::ChildIterator_var anIter = theComponent->GetStudy()->NewChildIterator(aMedFieldFather);
+    anIter->InitEx(1);  
     for(; anIter->More(); anIter->Next()) {
       SALOMEDS::SObject_var aSO = anIter->Value();
       SALOMEDS::GenericAttribute_var anAttr;
@@ -637,18 +641,18 @@ SALOMEDS::TMPFile* Med_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent,
          a<< myField->getOrderNumber();
          b<< myField->getIterationNumber();
 
-         TCollection_AsciiString aName(strdup(aSaveStudyName));
+         TCollection_AsciiString aName(aSaveStudyName);
          aName += "_MEDFIELD_";
          aName += myField->getName();
          aName += "_ORDRE_";
-         aName += strdup(a.str().c_str());
+         aName += (char*)(a.str().c_str());
          aName += "_ITER_";
-         aName += strdup(b.str().c_str());
+         aName += (char*)(b.str().c_str());
          aName += ".med";
          MESSAGE("Save mesh with name "<<aName.ToCString());
          long driverId = myField->addDriver(SALOME_MED::MED_DRIVER,(aTmpDir+aName).ToCString(),myField->getName());
          myField->write(driverId,"");
-         HDFascii::ConvertFromHDFToASCII(strdup((aTmpDir+aName).ToCString()), true);
+         HDFascii::ConvertFromHDFToASCII((aTmpDir+aName).ToCString(), true);
          aFileNames.Append(aName);
        }
       }
@@ -683,7 +687,7 @@ CORBA::Boolean Med_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
 
   // Get a temporary directory for a file
   TCollection_AsciiString aTmpDir =
-    (isMultiFile)?TCollection_AsciiString((char*)theURL):SALOMEDS_Tool::GetTmpDir();
+    (isMultiFile)?TCollection_AsciiString((char*)theURL):(char*)SALOMEDS_Tool::GetTmpDir().c_str();
   _saveFileName = CORBA::string_dup(aTmpDir.ToCString());
   SALOMEDS::ListOfFileNames_var aSeq =
     SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir.ToCString(), isMultiFile);
@@ -732,7 +736,7 @@ void Med_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent)
 char* Med_Gen_i::ComponentDataType()
 {
   MESSAGE("Med_Gen_i::ComponentDataType");
-  return strdup("MED") ; /* What is this type ? */
+  return CORBA::string_dup("MED") ; /* What is this type ? */
 }
     
 //=============================================================================
@@ -761,7 +765,7 @@ char* Med_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
   {
         // nothing to save : Support will be saved inside the mesh
        string str_MedName="_MED Objet Med + /OBJ_MED/";
-        return strdup(str_MedName.c_str()) ; 
+        return CORBA::string_dup(str_MedName.c_str()) ; 
   }
  
   // MESH
@@ -769,7 +773,7 @@ char* Med_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
   if (! CORBA::is_nil(myMesh)) 
   {
     CORBA::String_var aName((string("_MEDMESH_")+ myMesh->getName() + ".med").c_str());
-    return strdup(aName._retn()) ;
+    return aName._retn() ;
   }
     
   // SUPPORT
@@ -790,7 +794,7 @@ char* Med_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
                 THROW_SALOME_CORBA_EXCEPTION("Unable to save Field in Med"\
                                               ,SALOME::INTERNAL_ERROR);
        }
-    return strdup(("_MED"+str_SupportName).c_str());
+    return CORBA::string_dup(("_MED"+str_SupportName).c_str());
   }
     
   SALOME_MED::FIELD_var myField = SALOME_MED::FIELD::_narrow(myIOR);
@@ -804,7 +808,7 @@ char* Med_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
                             string("_ORDRE_")+a.str()+
                             string("_ITER_")+b.str() +
                             ".med").c_str());
-    return strdup(aName._retn());
+    return aName._retn();
   }
 
   //THROW_SALOME_CORBA_EXCEPTION("Unable to save IOR",SALOME::BAD_PARAM);
@@ -827,12 +831,12 @@ char* Med_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
 {
   const char * LOC = "Med_Gen_i::LocalPersistentIDToIOR" ;
   BEGIN_OF(LOC) ;
-  TCollection_AsciiString aTmpDir(CORBA::string_dup(_saveFileName.c_str()));
+  TCollection_AsciiString aTmpDir((char*)(_saveFileName.c_str()));
 
   TCollection_AsciiString aSaveStudyName("");
-  if (isMultiFile) aSaveStudyName = strdup(SALOMEDS_Tool::GetNameFromPath(theSObject->GetStudy()->URL()));
+  if (isMultiFile) aSaveStudyName = (char*)SALOMEDS_Tool::GetNameFromPath(theSObject->GetStudy()->URL()).c_str();
 
-  if (strcmp(aLocalPersistentID, "Objet Med + /OBJ_MED/") == 0) return strdup(""); // MED
+  if (strcmp(aLocalPersistentID, "Objet Med + /OBJ_MED/") == 0) return CORBA::string_dup(""); // MED
 
   if (strncmp(aLocalPersistentID, "_MEDMESH_",9) == 0) {// MESH
     MESH * myMesh= new MESH() ;
@@ -844,11 +848,11 @@ char* Med_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
 
     char* aFileName;
     if (isASCII) {
-      char* aResultPath = HDFascii::ConvertFromASCIIToHDF((aTmpDir + strdup(aLocalPersistentID)).ToCString());
+      char* aResultPath = HDFascii::ConvertFromASCIIToHDF((aTmpDir + aSaveStudyName + (char*)aLocalPersistentID).ToCString());
       aFileName = new char[strlen(aResultPath) + 19];
       sprintf(aFileName, "%shdf_from_ascii.hdf", aResultPath);
       delete(aResultPath);
-    } else aFileName = strdup((aTmpDir + aSaveStudyName + strdup(aLocalPersistentID)).ToCString());
+    } else aFileName = CORBA::string_dup((aTmpDir + aSaveStudyName + (char*)aLocalPersistentID).ToCString());
     MED_MESH_RDONLY_DRIVER myMeshDriver(aFileName,myMesh);
     try
       {
@@ -883,16 +887,16 @@ char* Med_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
     if (isASCII) {
       SALOMEDS::ListOfFileNames_var aFilesToRemove = new SALOMEDS::ListOfFileNames;
       aFilesToRemove->length(1);
-      aFilesToRemove[0] = strdup(&(aFileName[strlen(SALOMEDS_Tool::GetDirFromPath(aFileName))]));
-      SALOMEDS_Tool::RemoveTemporaryFiles(SALOMEDS_Tool::GetDirFromPath(aFileName), aFilesToRemove, true);
+      aFilesToRemove[0] = CORBA::string_dup(&(aFileName[strlen(SALOMEDS_Tool::GetDirFromPath(aFileName).c_str())]));
+      SALOMEDS_Tool::RemoveTemporaryFiles(SALOMEDS_Tool::GetDirFromPath(aFileName).c_str(), aFilesToRemove, true);
     }
     delete(aFileName);
     return(CORBA::string_dup(_orb->object_to_string(mesh)));
   } else if (strncmp(aLocalPersistentID, "_MEDFIELD_",14) == 0) { // FIELD
-    return(strdup("")); // not implemented yet
+    return(CORBA::string_dup("")); // not implemented yet
   }
 
-  return strdup("");
+  return CORBA::string_dup("");
 
   END_OF(LOC) ;
 }
@@ -988,21 +992,21 @@ SALOMEDS::TMPFile* Med_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::L
   // Try to get GEOM_Shape object by given SObject
   SALOMEDS::GenericAttribute_var anAttr;
   if (!theObject->FindAttribute(anAttr, "AttributeIOR")) return new SALOMEDS::TMPFile(0);
-  CORBA::String_var anIOR = strdup(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value());
+  CORBA::String_var anIOR = CORBA::string_dup(SALOMEDS::AttributeIOR::_narrow(anAttr)->Value());
   CORBA::Object_var anObj = _orb->string_to_object(anIOR);
   SALOME_MED::MESH_var aMesh = SALOME_MED::MESH::_narrow(anObj);
   if (aMesh->_is_nil()) return new SALOMEDS::TMPFile(0);
 
   // Get a temporary directory to store a temporary file
-  CORBA::String_var aTmpDir = SALOMEDS_Tool::GetTmpDir();
+  CORBA::String_var aTmpDir = SALOMEDS_Tool::GetTmpDir().c_str();
   // Create a list to store names of created files
   SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames;
   aSeq->length(1);
-  aSeq[0] = strdup(aMesh->getName());
+  aSeq[0] = CORBA::string_dup(aMesh->getName());
   char* aFullName = new char[strlen(aTmpDir)+strlen(aSeq[0])+1];
   strcpy(aFullName, aTmpDir);
   strcpy(aFullName+strlen(aTmpDir), aSeq[0]);
-  long driverId = aMesh->addDriver(SALOME_MED::MED_DRIVER,strdup(aFullName) , aMesh->getName());
+  long driverId = aMesh->addDriver(SALOME_MED::MED_DRIVER,aFullName , aMesh->getName());
   aMesh->write(driverId,"");
   delete(aFullName);
   
@@ -1040,9 +1044,9 @@ SALOMEDS::SObject_ptr Med_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream,
   
   SALOMEDS::Study_var aStudy = theObject->GetStudy();
 
-  CORBA::String_var aTmpDir = strdup(SALOMEDS_Tool::GetTmpDir());
+  CORBA::String_var aTmpDir = CORBA::string_dup(SALOMEDS_Tool::GetTmpDir().c_str());
   SALOMEDS::ListOfFileNames_var aSeq = SALOMEDS_Tool::PutStreamToFiles(theStream, aTmpDir, false);
-  CORBA::String_var aMeshName = strdup(aSeq[0]);
+  CORBA::String_var aMeshName = CORBA::string_dup(aSeq[0]);
   char* aFullName = new char[strlen(aTmpDir)+strlen(aMeshName)+1];
   strcpy(aFullName, aTmpDir);
   strcpy(aFullName+strlen(aTmpDir), aMeshName);

diff --git a/src/MEDMEM_I/MEDMEM_Support_i.hxx b/src/MEDMEM_I/MEDMEM_Support_i.hxx
index f35bf9e63d3829233f3fa75135688eb76d96edb2..d06a62d79fd6b8c725b3d80c769b10dd9c9a0514 100644 (file)
--- a/src/MEDMEM_I/MEDMEM_Support_i.hxx
+++ b/src/MEDMEM_I/MEDMEM_Support_i.hxx
@@ -27,7 +27,7 @@ class SUPPORT_i: public POA_SALOME_MED::SUPPORT,
                public SALOMEMultiComm
 {
 public :
-    static map < int,::MEDMEM::SUPPORT *> supportMap;
+    static std::map < int,::MEDMEM::SUPPORT *> supportMap;
 private :
     static int supportIndex;
 
@@ -36,7 +36,7 @@ protected :
      // C++ object containing values
      const ::MEDMEM::SUPPORT * const _support;
      const int   _corbaIndex ;
-     string      _supportId ;
+     std::string      _supportId ;
 
 public:
 

diff --git a/src/MedClient/src/FIELDDOUBLEClient.hxx b/src/MedClient/src/FIELDDOUBLEClient.hxx
index 61252201a4affd9c246251256199b211c3be1f2f..0e8b38883e5734885c8b3a310ba7a36775531af1 100644 (file)
--- a/src/MedClient/src/FIELDDOUBLEClient.hxx
+++ b/src/MedClient/src/FIELDDOUBLEClient.hxx
@@ -8,7 +8,7 @@ class FIELDDOUBLEClient :
 {
 public:
   FIELDDOUBLEClient(SALOME_MED::FIELDDOUBLE_ptr ptrCorba,
-                   SUPPORT * S = NULL);
+                   MEDMEM::SUPPORT * S = NULL);
   ~FIELDDOUBLEClient();
 };
 

diff --git a/src/MedClient/src/FIELDINTClient.hxx b/src/MedClient/src/FIELDINTClient.hxx
index 60de96c30c9cf0ba47fd38e107bdc30a4166cdc9..9b5236980dfc53c87357e55979e77c0a08a5186f 100644 (file)
--- a/src/MedClient/src/FIELDINTClient.hxx
+++ b/src/MedClient/src/FIELDINTClient.hxx
@@ -8,7 +8,7 @@ class FIELDINTClient :
 {
 public:
   FIELDINTClient(SALOME_MED::FIELDINT_ptr ptrCorba,
-                   SUPPORT * S = NULL);
+                MEDMEM::SUPPORT * S = NULL);
   ~FIELDINTClient();
 };
 

diff --git a/src/MedClient/src/UtilClient.hxx b/src/MedClient/src/UtilClient.hxx
index 87dc7e165ded13cc69e3b120fd8ffef662b25ccb..30fad3efbcd8b6a859f894bd1324df6f3969efb9 100644 (file)
--- a/src/MedClient/src/UtilClient.hxx
+++ b/src/MedClient/src/UtilClient.hxx
@@ -44,7 +44,7 @@ inline void convertCorbaArray (TLocal * & T, long &nT, const TCorbaSeq & S,
 
 template <typename TLocal,
          typename TCorbaSeq>
-inline void convertCorbaArray (vector<TLocal> & T, int &nT, 
+inline void convertCorbaArray (std::vector<TLocal> & T, int &nT, 
                               const TCorbaSeq & S)
 {
   int i, n = S->length();
@@ -64,7 +64,7 @@ inline void convertCorbaArray (vector<TLocal> & T, int &nT,
 template <typename TCorba,
          typename TLocal,
          typename TCorbaSeq>
-inline void convertCorbaArray (vector<TLocal> & T, int &nT, 
+inline void convertCorbaArray (std::vector<TLocal> & T, int &nT, 
                               const TCorbaSeq & S,
                               void *f)
 {
@@ -90,7 +90,7 @@ template <typename TCorba,
          typename TLocal,
          typename TCorbaSeq,
          typename TInfo>
-inline void convertCorbaArray (vector<TLocal> & T, 
+inline void convertCorbaArray (std::vector<TLocal> & T, 
                               const TCorbaSeq & S,
                               void *f, TInfo M)
 {

diff --git a/src/MedClient/src/libMEDClient.i b/src/MedClient/src/libMEDClient.i
index e0cf955163853ff45914450d58a9c83e025c7a20..408f846e9491e9c25500ec17425be3954a5dd6e9 100644 (file)
--- a/src/MedClient/src/libMEDClient.i
+++ b/src/MedClient/src/libMEDClient.i
@@ -41,7 +41,7 @@ class SUPPORTClient : public SUPPORT {
 class FIELDDOUBLEClient : public FIELDDOUBLE {
 public:
   FIELDDOUBLEClient(SALOME_MED::FIELDDOUBLE_ptr ptrCorba,
-                   SUPPORT * S = NULL);
+                   MEDMEM::SUPPORT * S = NULL);
 
   ~FIELDDOUBLEClient();
 };
@@ -49,7 +49,7 @@ public:
 class FIELDINTClient : public FIELDINT {
 public:
   FIELDINTClient(SALOME_MED::FIELDINT_ptr ptrCorba,
-                SUPPORT * S = NULL);
+                MEDMEM::SUPPORT * S = NULL);
 
   ~FIELDINTClient();
 };