Changeset 1134 for XIOS/dev/branch_yushan_merged/src/client_server_mapping.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/client_server_mapping.hpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/src/client_server_mapping.hpp

@@ -14 +14 @@
 #include "mpi.hpp"
 #include <boost/unordered_map.hpp>
+#ifdef _usingEP
+#include "ep_declaration.hpp"
+#endif
+
 
 namespace xios {
@@ -37 +41 @@
 
     static std::map<int,int> computeConnectedClients(int nbServer, int nbClient,
-                                                     MPI_Comm& clientIntraComm,
+                                                     ep_lib::MPI_Comm& clientIntraComm,
                                                      const std::vector<int>& connectedServerRank);