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

src/parallel/decompose/kahipDecomp/kahipDecomp.C

@@ -29,13 +29,20 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "Time.H"
 #include "PrecisionAdaptor.H"
+#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"
 
-#include <string>
-#include <map>
-#include <vector>
-
 // 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"