Minor: portability issue. On CentOS5.2, MPI_Datatype is an int.

Also turned deprecated SUBDIRS() Cmake command into ADD_SUBDIRECTORY().

diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake
index e9b04a1f6505cf296c85e34c0b90af1575a9ce31..66444183e4fc28b9d2bcc812b707f0428a2ecdcf 100644 (file)
--- a/src/CTestTestfileInstall.cmake
+++ b/src/CTestTestfileInstall.cmake
@@ -17,4 +17,4 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SUBDIRS(MEDCoupling)
+ADD_SUBDIRECTORY(MEDCoupling)

diff --git a/src/CTestTestfileInstallMEDCoupling.cmake b/src/CTestTestfileInstallMEDCoupling.cmake
index e9effc1faed8b7bb93f4da8c455f9121c7987526..d49fd8d017244415e59a4d0684bc754e61e8b255 100644 (file)
--- a/src/CTestTestfileInstallMEDCoupling.cmake
+++ b/src/CTestTestfileInstallMEDCoupling.cmake
@@ -19,17 +19,17 @@
 
 SET(COMPONENT_NAME MEDCOUPLING)
 
-SUBDIRS(INTERP_KERNELTest)
-SUBDIRS(MEDCalculator)
-SUBDIRS(MEDCoupling)
-#SUBDIRS(MEDCouplingCorba)
-#SUBDIRS(MEDCouplingCorba_Swig)
-SUBDIRS(MEDCoupling_Swig)
-SUBDIRS(MEDLoader)
-SUBDIRS(MEDLoader/Swig)
-#SUBDIRS(MEDOP)
-SUBDIRS(MEDPartitioner)
-#SUBDIRS(ParaMEDMEM_Swig)
-#SUBDIRS(ParaMEDMEMTest)
-SUBDIRS(MEDPartitioner_Swig)
-SUBDIRS(RENUMBER_Swig)
+ADD_SUBDIRECTORY(INTERP_KERNELTest)
+ADD_SUBDIRECTORY(MEDCalculator)
+ADD_SUBDIRECTORY(MEDCoupling)
+#ADD_SUBDIRECTORY(MEDCouplingCorba)
+#ADD_SUBDIRECTORY(MEDCouplingCorba_Swig)
+ADD_SUBDIRECTORY(MEDCoupling_Swig)
+ADD_SUBDIRECTORY(MEDLoader)
+ADD_SUBDIRECTORY(MEDLoader/Swig)
+#ADD_SUBDIRECTORY(MEDOP)
+ADD_SUBDIRECTORY(MEDPartitioner)
+#ADD_SUBDIRECTORY(ParaMEDMEM_Swig)
+#ADD_SUBDIRECTORY(ParaMEDMEMTest)
+ADD_SUBDIRECTORY(MEDPartitioner_Swig)
+ADD_SUBDIRECTORY(RENUMBER_Swig)

diff --git a/src/ParaMEDMEM/MPIAccess.hxx b/src/ParaMEDMEM/MPIAccess.hxx
index 9f4eea74400aef85f5b1a1c92134031e2d988bf0..d438c8cec980f37cd01d43e61e230bb491354e66 100644 (file)
--- a/src/ParaMEDMEM/MPIAccess.hxx
+++ b/src/ParaMEDMEM/MPIAccess.hxx
@@ -322,7 +322,7 @@ namespace ParaMEDMEM
     struct RequestStruct *aRequestStruct = _map_of_request_struct[ RequestId ] ;
     if ( aRequestStruct )
       return aRequestStruct->MPIDatatype;
-    return (MPI_Datatype ) NULL ;
+    return MPI_DATATYPE_NULL;
   }
 
   // Returns the size of the receiving message of the request corresponding to