Changeset 694

Timestamp:

09/18/15 08:54:50 (9 years ago)

Author:

rlacroix

Message:

Fix compilation issues caused by the new "remap" library.

Use our MPI header so that C++ bindings are always disabled.

Location:

XIOS/trunk/extern/remap

Files:

• src/cputime.cpp (modified) (1 diff)
• src/libmapper.cpp (modified) (1 diff)
• src/mapper.cpp (modified) (1 diff)
• src/mapper.hpp (modified) (1 diff)
• src/mpi_cascade.hpp (modified) (1 diff)
• src/mpi_routing.cpp (modified) (1 diff)
• src/mpi_routing.hpp (modified) (1 diff)
• src/node.cpp (modified) (1 diff)
• src/parallel_tree.hpp (modified) (1 diff)
• src/timerRemap.cpp (modified) (1 diff)
• src/timerRemap.hpp (modified) (1 diff)
• src/tree.cpp (modified) (1 diff)
• test-main.cpp (modified) (1 diff)

XIOS/trunk/extern/remap/src/cputime.cpp

@@ -1 @@
-#include <mpi.h>
+#include "mpi.hpp"
 
 namespace sphereRemap {

XIOS/trunk/extern/remap/src/libmapper.cpp

@@ -1 @@
-//#include "mpi.h" // some compiler fails if mpi.h is not the first header to be included
-#include <mpi.h>
+#include "mpi.hpp"
 #include <vector>
 #include <cassert>

XIOS/trunk/extern/remap/src/mapper.cpp

@@ -1 @@
-//#include "mpi.h" // some compiler fails if mpi.h is not the first header to be included
-#include <mpi.h>
+#include "mpi.hpp"
 #include <map>
 #include "cputime.hpp"       /* time */

XIOS/trunk/extern/remap/src/mapper.hpp

@@ -2 +2 @@
 #define __MAPPER_HPP__
 #include "parallel_tree.hpp"
-#include <mpi.h>
-//#include "mpi.h"
+#include "mpi.hpp"
 
 namespace sphereRemap {

XIOS/trunk/extern/remap/src/mpi_cascade.hpp

@@ -2 +2 @@
 #define  __MPI_CASCADE_HPP__
 
-#include <mpi.h>
+#include "mpi.hpp"
 #include <vector>
 #include <cassert>

XIOS/trunk/extern/remap/src/mpi_routing.cpp

@@ -1 +1 @@
 #include "mpi_routing.hpp"
-#include <mpi.h>
+#include "mpi.hpp"
 #include "node.hpp"
 #include "elt.hpp"

XIOS/trunk/extern/remap/src/mpi_routing.hpp

@@ -2 +2 @@
 #define  __MPI_ROUTING_HPP__
 
-#include <mpi.h>
+#include "mpi.hpp"
 #include <vector>
 #include "mpi_cascade.hpp"

XIOS/trunk/extern/remap/src/node.cpp

@@ -1 @@
-//#include "mpi.h" // some compiler fails if mpi.h is not the first header to be included
-#include <mpi.h>
+#include "mpi.hpp"
 #include <cstdlib>
 #include <cmath>

XIOS/trunk/extern/remap/src/parallel_tree.hpp

@@ -5 +5 @@
 //#include "sample_tree.hpp"
 #include "mpi_cascade.hpp"
-//#include "mpi.h"
-#include <mpi.h>
+#include "mpi.hpp"
 
 namespace sphereRemap {

XIOS/trunk/extern/remap/src/timerRemap.cpp

@@ -1 +1 @@
 #include "timerRemap.hpp"
-#include <mpi.h>
+#include "mpi.hpp"
 #include <string>
 #include <map>

XIOS/trunk/extern/remap/src/timerRemap.hpp

@@ -2 +2 @@
 #define __TIMER_HPP__
 
-#include <mpi.h> // some compiler fails if mpi.h is not the first header to be included
-//#include "mpi.h" // some compiler fails if mpi.h is not the first header to be included
+#include "mpi.hpp"
 #include <string>
 #include <map>

XIOS/trunk/extern/remap/src/tree.cpp

@@ -4 +4 @@
 #include "elt.hpp"
 #include <iostream>
-#include <mpi.h>
+#include "mpi.hpp"
 #include <stdlib.h>     /* srand, rand */
 #include <time.h>       /* time */

XIOS/trunk/extern/remap/test-main.cpp

@@ -1 @@
-#include <mpi.h>
+#include "mpi.hpp"
 #include <netcdf.h>
 #include "errhandle.hpp"