From 5e9891dcb7d7530e27cab8cd4ab1fbec1f2d4ca8 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 8 Sep 2019 18:00:52 +0200
Subject: [PATCH] suppress -Wmacro-redefined warnings caused by netgen headers

---
 .../src/NETGENPlugin/NETGENPlugin_Mesher.cpp         | 11 +++++++++++
 .../src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp      | 11 +++++++++++
 .../src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp    | 11 +++++++++++
 .../src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp | 11 +++++++++++
 .../src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp      | 12 ++++++++++++
 5 files changed, 56 insertions(+)

diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
index d507e41d87..d9d4b3d73e 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
@@ -77,9 +77,20 @@ namespace nglib {
 #define OCCGEOMETRY
 #endif
 
+// DLL_HEADER is re-defined in netgen headers
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wmacro-redefined"
+#endif
+
 #include <occgeom.hpp>
 #include <meshing.hpp>
 //#include <ngexception.hpp>
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
 namespace netgen {
 #if NETGEN_VERSION >= NETGEN_VERSION_STRING(6,2)
   DLL_HEADER extern int OCCGenerateMesh (OCCGeometry&, shared_ptr<Mesh>&, MeshingParameters&);
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
index 6e52d3ecc7..050e0da956 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
@@ -44,8 +44,19 @@
 namespace nglib {
 #include <nglib.h>
 }
+
+// DLL_HEADER is re-defined in netgen headers
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wmacro-redefined"
+#endif
+
 #include <meshing.hpp>
 
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
 using namespace std;
 
 //=============================================================================
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp
index 3fd01d61d2..eb15ca18d2 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp
@@ -43,8 +43,19 @@
 namespace nglib {
 #include <nglib.h>
 }
+
+// DLL_HEADER is re-defined in netgen headers
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wmacro-redefined"
+#endif
+
 #include <meshing.hpp>
 
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
 using namespace std;
 
 //=============================================================================
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
index 2c0184495a..ef44814fd1 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
@@ -62,9 +62,20 @@ namespace nglib {
 # define OCCGEOMETRY
 #endif
 
+// DLL_HEADER is re-defined in netgen headers
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wmacro-redefined"
+#endif
+
 #include <occgeom.hpp>
 #include <meshing.hpp>
 //#include <meshing/meshtype.hpp>
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
 namespace netgen {
 #if NETGEN_VERSION >= NETGEN_VERSION_STRING(6,2)
   DLL_HEADER extern int OCCGenerateMesh (OCCGeometry&, shared_ptr<Mesh>&, MeshingParameters&);
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp
index fdcb0a4371..a3a3de9404 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp
@@ -70,7 +70,19 @@
 #ifndef OCCGEOMETRY
 #define OCCGEOMETRY
 #endif
+
+// DLL_HEADER is re-defined in netgen headers
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wmacro-redefined"
+#endif
+
 #include <occgeom.hpp>
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
 namespace nglib {
 #include <nglib.h>
 }