Fix compilation problem (caused by latest changes in MED module)

diff --git a/src/VISU_I/VISUConfig.hh b/src/VISU_I/VISUConfig.hh
index c463972a06f1b0239f3bfa9a097ab8ab28a74b2f..164f6bd236ddec8f95eaae3e58c81313b31fb37e 100644 (file)
--- a/src/VISU_I/VISUConfig.hh
+++ b/src/VISU_I/VISUConfig.hh
@@ -36,6 +36,7 @@
 #include CORBA_SERVER_HEADER(MED)
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
+#include CORBA_SERVER_HEADER(SALOME_Types)
 
 #include "SALOME_NamingService.hxx"
 #include "SALOME_LifeCycleCORBA.hxx"

diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx
index 898ad2c38924d19fad78d9b52aa355c101e85a1c..85870069b4ad9aa7f9fee15ac2652775feb84318 100644 (file)
--- a/src/VISU_I/VISU_CorbaMedConvertor.cxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx
@@ -580,7 +580,7 @@ namespace
       VISU::EGeometry aEGeom = aGeom2SubProfileIter->first;
       SALOME_MED::medGeometryElement aMGeom = VISUGeomToMED(aEGeom);
       VISU::PCSubProfile aSubProfile = aGeom2SubProfileIter->second;
-      SALOME_MED::long_array_var aGeom2ProfileIds;
+      SALOME_TYPES::ListOfLong_var aGeom2ProfileIds;
       std::vector<int> aGeom2Profile;
       if(!aSupport->isOnAllElements()){
         try{
@@ -813,7 +813,7 @@ VISU_MEDConvertor
     return NULL;
 
   CORBA::Long aNbMeshes = theMED->getNumberOfMeshes();
-  SALOME_MED::string_array_var aMeshNames = theMED->getMeshNames();
+  SALOME_TYPES::ListOfString_var aMeshNames = theMED->getMeshNames();
   if(MYDEBUG) MESSAGE("VISU_MEDConvertor::Build - aNbMeshes = "<<aNbMeshes);
 
   SALOMEDS::Study_var aStudy = mySObject->GetStudy();
@@ -1331,7 +1331,7 @@ VISU_MEDConvertor
   if(aNbElem <= 0) 
     throw std::runtime_error("LoadPoints >> There is no points in the mesh !!!");
 
-  SALOME_MED::double_array_var aCCoord = aMedMesh->getCoordinates(SALOME_MED::MED_FULL_INTERLACE);
+  SALOME_TYPES::ListOfDouble_var aCCoord = aMedMesh->getCoordinates(SALOME_MED::MED_FULL_INTERLACE);
   VISU::TCMEDCoordHolder* aCoordHolder = new VISU::TCMEDCoordHolder();
   aCoordHolder->Init(aNbElem, aDim, aCCoord);
 
@@ -1376,7 +1376,7 @@ VISU_MEDConvertor
   
   if(!anIsOnAllElements){
     SALOME_MED::medGeometryElement_array_var aGeom = aMedFamily->getTypes();
-    SALOME_MED::long_array_var aCellNumForType = aMedFamily->getNumber(aGeom[0]);
+    SALOME_TYPES::ListOfLong_var aCellNumForType = aMedFamily->getNumber(aGeom[0]);
     int aSize = aNbElem;
     aNbElem = aCellNumForType->length();
     for(int iElem = 0; iElem < aNbElem; iElem++){
@@ -1602,7 +1602,7 @@ VISU_MEDConvertor
       int aVNbNodes = VISUGeom2NbNodes(aEGeom);
       int aNbElem = anInfo->numberOfElements[iGeom];
       if (aNbElem > 0) {
-        SALOME_MED::long_array_var aConn = 
+        SALOME_TYPES::ListOfLong_var aConn = 
           aMedMesh->getConnectivity(SALOME_MED::MED_FULL_INTERLACE,
                                     SALOME_MED::MED_NODAL,
                                     aMEntity,
@@ -1747,7 +1747,7 @@ VISU_MEDConvertor
     if(MYDEBUG) MESSAGE("LoadCellsOnFamily - iGeomEnd = "<<iGeomEnd);
     for(int iGeom = 0; iGeom < iGeomEnd; iGeom++){
       SALOME_MED::medGeometryElement aMGeom = aGeoms[iGeom];
-      SALOME_MED::long_array_var aCellNumForType = aMedFamily->getNumber(aMGeom);
+      SALOME_TYPES::ListOfLong_var aCellNumForType = aMedFamily->getNumber(aMGeom);
       VISU::EGeometry aEGeom = MEDGeom2VISU(aMGeom);
 
       int aNbElem = aCellNumForType->length();
@@ -1867,7 +1867,7 @@ VISU_MEDConvertor
   
   SALOME_MED::FIELDDOUBLE_ptr aFieldDouble = SALOME_MED::FIELDDOUBLE::_narrow(aMEDField);
   if(!aFieldDouble->_is_nil()){
-    SALOME_MED::double_array_var anArray = aFieldDouble->getValue(SALOME_MED::MED_FULL_INTERLACE);
+    SALOME_TYPES::ListOfDouble_var anArray = aFieldDouble->getValue(SALOME_MED::MED_FULL_INTERLACE);
     if(MYDEBUG) MESSAGE("VISU_MEDConvertor::LoadField - There is FIELDDOUBLE = "<<anArray->length());
     ImportField<CORBA::Double>(anArray,
                                theMesh,
@@ -1878,7 +1878,7 @@ VISU_MEDConvertor
 
   SALOME_MED::FIELDINT_ptr aFieldInt = SALOME_MED::FIELDINT::_narrow(aMEDField);
   if(!aFieldInt->_is_nil()){
-    SALOME_MED::long_array_var anArray = aFieldInt->getValue(SALOME_MED::MED_FULL_INTERLACE);
+    SALOME_TYPES::ListOfLong_var anArray = aFieldInt->getValue(SALOME_MED::MED_FULL_INTERLACE);
     if(MYDEBUG) MESSAGE("VISU_MEDConvertor::LoadField - There is FIELDINT = "<<anArray->length());
     ImportField<CORBA::Long>(anArray,
                              theMesh,

diff --git a/src/VISU_I/VISU_CorbaMedConvertor.hxx b/src/VISU_I/VISU_CorbaMedConvertor.hxx
index dc8484572d48d4686572bd94ca60a078f4260d35..5d9079b169c87c1dfe201533d0559b8c28e78bdd 100644 (file)
--- a/src/VISU_I/VISU_CorbaMedConvertor.hxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.hxx
@@ -44,7 +44,7 @@ namespace VISU
   typedef std::map<SALOME_MED::medGeometryElement, TIndexAndSize> TCellsFirstIndex; // key: SALOME_MED::medGeometryElement
 
   //---------------------------------------------------------------
-  struct TCMEDCoordHolder: TCoordHolder<SALOME_MED::double_array_var>
+  struct TCMEDCoordHolder: TCoordHolder<SALOME_TYPES::ListOfDouble_var>
   {
     virtual
     const TCoord*