COMP: guards around #define OMPI_SKIP_MPICXX (avoids compiler warnings)

applications/test/00-dummy/library/mpi/dummyMpiLib.cpp

@@ -27,6 +27,14 @@ License
 
 #include "dummyLib.H"
 #include <iostream>
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //

applications/test/parallel-comm2/Test-parallel-comm2.C

@@ -40,6 +40,14 @@ Description
 #include "IOstreams.H"
 #include "PstreamReduceOps.H"
 #include "SHA1.H"
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 using namespace Foam;

applications/test/parallel-comm3a/Test-parallel-comm3a.C

@@ -40,10 +40,19 @@ Description
 #include "IOstreams.H"
 #include "StringStream.H"
 #include "Random.H"
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 using namespace Foam;
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 void printRequests(const UList<MPI_Request>& requests)
 {

applications/test/parallel-external-init/Test-parallel-external-init.C

@@ -38,9 +38,16 @@ Description
 #include "vector.H"
 #include "IOstreams.H"
 #include "Pstream.H"
+#include <iostream>
 
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
-#include <iostream>
 
 using namespace Foam;
 

applications/test/processorTopology/Test-processorTopology.C

@@ -33,6 +33,14 @@ Description
 #include "polyMesh.H"
 #include "globalMeshData.H"
 #include "OFstream.H"
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 using namespace Foam;

src/Pstream/mpi/PstreamGlobals.H

@@ -41,6 +41,14 @@ SourceFiles
 
 #include "DynamicList.H"
 #include "UPstream.H"  // for UPstream::Request
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/Pstream/mpi/UPstreamWrapping.H

@@ -39,6 +39,14 @@ SourceFiles
 #define Foam_UPstreamWrapping_H
 
 #include "UPstream.H"
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/parallel/decompose/kahipDecomp/kahipDecomp.C

@@ -29,13 +29,20 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "Time.H"
 #include "PrecisionAdaptor.H"
-
-#include "kaHIP_interface.h"
-
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
+// Probably not needed, but in case we pickup parhip_interface.h
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
+
+#include "kaHIP_interface.h"
+
 // Provide a clear error message if we have a severe size mismatch
 // Allow widening, but not narrowing
 

src/parallel/decompose/metisDecomp/metisDecomp.C

@@ -32,8 +32,12 @@ License
 #include "PrecisionAdaptor.H"
 
 // Probably not needed...
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
 
 #include "metis.h"
 

src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C

@@ -32,12 +32,20 @@ License
 #include "Time.H"
 #include "PrecisionAdaptor.H"
 #include "OFstream.H"
+#include <cstdio>
 #include <limits>
 
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
+
 // Avoid too many warnings from mpi.h
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 
-#include <cstdio>
 #include <mpi.h>
 #include "ptscotch.h"
 

src/parallel/decompose/scotchDecomp/scotchDecomp.C

@@ -32,11 +32,16 @@ License
 #include "Time.H"
 #include "PrecisionAdaptor.H"
 #include "OFstream.H"
+#include <cstdio>
 #include <limits>
 
 // Probably not needed, but in case we pickup a ptscotch.h ...
+#ifndef MPICH_SKIP_MPICXX
 #define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
 #define OMPI_SKIP_MPICXX
+#endif
 
 #include "scotch.h"
 

src/renumber/zoltanRenumber/zoltanRenumber.C

@@ -59,6 +59,14 @@ SourceFiles
 #include "globalIndex.H"
 #include "uint.H"
 
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
+
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #include "zoltan.h"
 #include <mpi.h>