From: rnv <rnv@opencascade.com>
Date: Tue, 4 Aug 2020 09:27:57 +0000 (+0300)
Subject: Small refactoring.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frnv%2Fnative_openmpi_centos8;p=tools%2Fmedcoupling.git

Small refactoring.
---

diff --git a/src/ParaMEDMEMTest/MPI2Connector.cxx b/src/ParaMEDMEMTest/MPI2Connector.cxx
index ef55de0f8..87b16bfb2 100644
--- a/src/ParaMEDMEMTest/MPI2Connector.cxx
+++ b/src/ParaMEDMEMTest/MPI2Connector.cxx
@@ -26,6 +26,12 @@
 #include <unistd.h>
 #endif
 
+#if OMPI_MAJOR_VERSION >= 4
+#define MPI_ERROR_HANDLER(var) MPI_Comm_set_errhandler(MPI_COMM_WORLD, var);
+#else
+#define MPI_ERROR_HANDLER(var) MPI_Errhandler_set(MPI_COMM_WORLD, var);
+#endif
+
 MPI2Connector::MPI2Connector()
 {
   MPI_Comm_size( MPI_COMM_WORLD, &_nb_proc );
@@ -54,11 +60,7 @@ MPI_Comm MPI2Connector::remoteMPI2Connect(const std::string& service)
   _srv = false;
 
   MPI_Barrier(MPI_COMM_WORLD);
-#if OMPI_MAJOR_VERSION >= 4
-  MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
-#else
-  MPI_Errhandler_set(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
-#endif
+  MPI_ERROR_HANDLER(MPI_ERRORS_RETURN);
   if( _num_proc == 0 )
     { 
       /* rank 0 try to be a server. If service is already published, try to be a cient */
@@ -107,11 +109,7 @@ MPI_Comm MPI2Connector::remoteMPI2Connect(const std::string& service)
           throw std::exception();
         }
     }
-#if OMPI_MAJOR_VERSION >= 4
-  MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_ARE_FATAL);
-#else
-  MPI_Errhandler_set(MPI_COMM_WORLD, MPI_ERRORS_ARE_FATAL);
-#endif
+  MPI_ERROR_HANDLER(MPI_ERRORS_ARE_FATAL);
   
   /* If rank 0 is server, all processes call MPI_Comm_accept */
   /* If rank 0 is not server, all processes call MPI_Comm_connect */