Changeset 1134 for XIOS/dev/branch_yushan_merged/src/registry.hpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/registry.hpp (modified) (3 diffs)

XIOS/dev/branch_yushan_merged/src/registry.hpp

@@ -6 +6 @@
 #include "mpi.hpp"
 #include "message.hpp"
+#ifdef _usingEP
+#include "ep_declaration.hpp"
+#endif
+
 
 // Those two headers can be replaced by the C++11 equivalent in the future
@@ -23 +27 @@
 
 /** Constructor, the communicator is used for bcast or gather operation between MPI processes */
-      CRegistry(const MPI_Comm& comm=MPI_COMM_WORLD) : communicator(comm) {}
+      CRegistry(const ep_lib::MPI_Comm& comm=MPI_COMM_WORLD) : communicator(comm) {}
 
 /** Copy constructor */
@@ -120 +124 @@
 
 /** MPI communicator used for broadcast and gather operation */
-      MPI_Comm communicator ;
+      ep_lib::MPI_Comm communicator ;
   } ;