From 1696432e8220906c38c2603879a3fb7fba490a76 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Wed, 3 Apr 2019 01:00:53 -0400
Subject: [PATCH] resolve conflict between src/STUBS/mpi.h and
 lib/message/cslib/src/STUBS_MPI/mpi.h

---
 lib/message/cslib/src/STUBS_MPI/{mpi.h => mpi_dummy.h} | 0
 lib/message/cslib/src/cslib.cpp                        | 4 ++++
 lib/message/cslib/src/cslib_wrap.cpp                   | 4 ++++
 lib/message/cslib/src/msg.cpp                          | 4 ++++
 lib/message/cslib/src/msg.h                            | 6 +++++-
 lib/message/cslib/src/msg_file.cpp                     | 4 ++++
 lib/message/cslib/src/msg_mpi_one.cpp                  | 4 ++++
 lib/message/cslib/src/msg_mpi_two.cpp                  | 4 ++++
 lib/message/cslib/src/msg_zmq.cpp                      | 4 ++++
 9 files changed, 33 insertions(+), 1 deletion(-)
 rename lib/message/cslib/src/STUBS_MPI/{mpi.h => mpi_dummy.h} (100%)

diff --git a/lib/message/cslib/src/STUBS_MPI/mpi.h b/lib/message/cslib/src/STUBS_MPI/mpi_dummy.h
similarity index 100%
rename from lib/message/cslib/src/STUBS_MPI/mpi.h
rename to lib/message/cslib/src/STUBS_MPI/mpi_dummy.h
diff --git a/lib/message/cslib/src/cslib.cpp b/lib/message/cslib/src/cslib.cpp
index 874333607e..336ba87588 100644
--- a/lib/message/cslib/src/cslib.cpp
+++ b/lib/message/cslib/src/cslib.cpp
@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/message/cslib/src/cslib_wrap.cpp b/lib/message/cslib/src/cslib_wrap.cpp
index c2d69eaf0d..64b4d53b25 100644
--- a/lib/message/cslib/src/cslib_wrap.cpp
+++ b/lib/message/cslib/src/cslib_wrap.cpp
@@ -14,7 +14,11 @@
 
 // C style library interface to CSlib class
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/message/cslib/src/msg.cpp b/lib/message/cslib/src/msg.cpp
index da22c81850..ff654ecbcf 100644
--- a/lib/message/cslib/src/msg.cpp
+++ b/lib/message/cslib/src/msg.cpp
@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <cstdio>
 #include <cstring>
 #include <cstdlib>
diff --git a/lib/message/cslib/src/msg.h b/lib/message/cslib/src/msg.h
index f75942b027..81c2d21cb9 100644
--- a/lib/message/cslib/src/msg.h
+++ b/lib/message/cslib/src/msg.h
@@ -15,7 +15,11 @@
 #ifndef MSG_H
 #define MSG_H
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 
 namespace CSLIB_NS {
 
@@ -37,7 +41,7 @@ class Msg {
   int nfield;
   int *fieldID,*fieldtype,*fieldlen;
   int lengths[2];
-  
+
   void init(int);
   void allocate(int, int &, int *&, int, int &, char *&);
   void *smalloc(int);
diff --git a/lib/message/cslib/src/msg_file.cpp b/lib/message/cslib/src/msg_file.cpp
index d97e249fad..31cdfef544 100644
--- a/lib/message/cslib/src/msg_file.cpp
+++ b/lib/message/cslib/src/msg_file.cpp
@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/message/cslib/src/msg_mpi_one.cpp b/lib/message/cslib/src/msg_mpi_one.cpp
index db11735b27..c6fbd8732f 100644
--- a/lib/message/cslib/src/msg_mpi_one.cpp
+++ b/lib/message/cslib/src/msg_mpi_one.cpp
@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/lib/message/cslib/src/msg_mpi_two.cpp b/lib/message/cslib/src/msg_mpi_two.cpp
index e9a9e87eeb..2a4fa65ff7 100644
--- a/lib/message/cslib/src/msg_mpi_two.cpp
+++ b/lib/message/cslib/src/msg_mpi_two.cpp
@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/lib/message/cslib/src/msg_zmq.cpp b/lib/message/cslib/src/msg_zmq.cpp
index c2d408f3a5..8bee3aebde 100644
--- a/lib/message/cslib/src/msg_zmq.cpp
+++ b/lib/message/cslib/src/msg_zmq.cpp
@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <zmq.h>
 #include <string.h>
 #include <stdlib.h>