From c6f81d9f0c97fabf759a4e8cf58b06a18e40082d Mon Sep 17 00:00:00 2001 From: abn Date: Tue, 9 Jun 2015 14:20:51 +0200 Subject: [PATCH] Minor: portability issue. On CentOS5.2, MPI_Datatype is an int. Also turned deprecated SUBDIRS() Cmake command into ADD_SUBDIRECTORY(). --- src/CTestTestfileInstall.cmake | 2 +- src/CTestTestfileInstallMEDCoupling.cmake | 28 +++++++++++------------ src/ParaMEDMEM/MPIAccess.hxx | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake index e9b04a1f6..66444183e 100644 --- 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 e9effc1fa..d49fd8d01 100644 --- 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 9f4eea744..d438c8cec 100644 --- 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 -- 2.39.2