Fix compilation errors, appeared after merge.

diff --git a/src/MEDMEM/MEDMEM_Field.hxx b/src/MEDMEM/MEDMEM_Field.hxx
index 7fa8bf9b7a68e9a08b085714f7bd76b62b4f9593..32c17117a97095c8a030a8e475bde153683a5dcd 100644 (file)
--- a/src/MEDMEM/MEDMEM_Field.hxx
+++ b/src/MEDMEM/MEDMEM_Field.hxx
@@ -61,7 +61,7 @@ namespace MEDMEM {
   template < > struct SET_VALUE_TYPE<int> {
     static const MED_EN::med_type_champ _valueType = MED_EN::MED_INT32; };
 
-class MEDMEM_EXPORT FIELD_    // GENERIC POINTER TO a template <class T, class INTERLACING_TAG> class FIELD
+class FIELD_    // GENERIC POINTER TO a template <class T, class INTERLACING_TAG> class FIELD
 {
 protected:
 

diff --git a/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx b/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx
index aac96c949e4f607db756c3e63c97ac2a7a8c0aed..97cff38387d7d835b42779c7b384cf55c60afb28 100644 (file)
--- a/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx
+++ b/src/MEDMEM/MEDMEM_MedFieldDriver22.hxx
@@ -875,8 +875,8 @@ template <class T> void MED_FIELD_RDONLY_DRIVER22<T>::read(void)
   vector< int >  MESHnbOfElOfType;
   vector< int >  MESHnbOfElOfTypeC;
   if ( haveMesh )
-    getMeshGeometricTypeFromMESH(ptrMesh,entityType,MESHgeoType,
-                                MESHnbOfElOfType,MESHnbOfElOfTypeC);
+    this->getMeshGeometricTypeFromMESH(ptrMesh,entityType,MESHgeoType,
+                                       MESHnbOfElOfType,MESHnbOfElOfTypeC);
 
   int fileHasMesh = ( med_2_2::MEDdimLire(id, const_cast<char *>(meshName.c_str())) > 0);
   vector< MED_EN::medGeometryElement >  meshGeoType;
@@ -884,8 +884,8 @@ template <class T> void MED_FIELD_RDONLY_DRIVER22<T>::read(void)
   vector< int >  meshNbOfElOfTypeC;
   // Si le maillage n'est pas trouvé les tableaux renvoyés sont vides
   if (fileHasMesh)
-    getMeshGeometricTypeFromFile(id,meshName,entityType,meshGeoType,
-                                meshNbOfElOfType,meshNbOfElOfTypeC);
+    this->getMeshGeometricTypeFromFile(id,meshName,entityType,meshGeoType,
+                                       meshNbOfElOfType,meshNbOfElOfTypeC);
 
 
   if (fileHasMesh && haveSupport )
@@ -1448,15 +1448,14 @@ template <class T> void MED_FIELD_WRONLY_DRIVER22<T>::write(void) const
     MESH * meshPtr = mySupport->getMesh();
 
     if (fileHasMesh)
-      getMeshGeometricTypeFromFile(id, meshName,
-                                  entityType,
-                                  fileMeshGeoType,fileMeshNbOfElOfType,fileMeshNbOfElOfTypeC);
+      this->getMeshGeometricTypeFromFile(id, meshName,
+                                         entityType,
+                                         fileMeshGeoType,fileMeshNbOfElOfType,fileMeshNbOfElOfTypeC);
 
     if (meshPtr) {
-
-      getMeshGeometricTypeFromMESH( meshPtr, entityType,meshGeoType,
-                                   meshNbOfElOfType,
-                                   meshNbOfElOfTypeC);
+      this->getMeshGeometricTypeFromMESH( meshPtr, entityType,meshGeoType,
+                                          meshNbOfElOfType,
+                                          meshNbOfElOfTypeC);
 
       if (fileHasMesh)
        if ( ( fileMeshGeoType != meshGeoType ) || (fileMeshNbOfElOfTypeC != meshNbOfElOfTypeC) )

diff --git a/src/MEDMEM/MEDMEM_nArray.hxx b/src/MEDMEM/MEDMEM_nArray.hxx
index 467e59749cce071a32a7b7643fee50fda1f5238a..8651cb531e9c2905e1c7887c27ba1a8bcb785e15 100644 (file)
--- a/src/MEDMEM/MEDMEM_nArray.hxx
+++ b/src/MEDMEM/MEDMEM_nArray.hxx
@@ -229,7 +229,7 @@ public  :
     if ( this == &array ) return true;
 
     int size = array.getArraySize();
-    if ( size != getArraySize() ) return false;
+    if ( size != this->getArraySize() ) return false;
 
     ARRAY_ELEMENT_TYPE * arrayPtr =
       const_cast<MEDMEM_Array &>(array).getPtr();