+ check if OCCGEOMETRY is already defined

2016-03-28 11:05:51 +02:00
parent 27f12ae3de
commit 7dbcbc0f76
2 changed files with 7 additions and 3 deletions
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
@@ -61,7 +61,10 @@
 namespace nglib {
 #include <nglib.h>
 }
-#define OCCGEOMETRY
+#ifndef OCCGEOMETRY
+# define OCCGEOMETRY
+#endif
+
 #include <occgeom.hpp>
 #include <meshing.hpp>
 //#include <ngexception.hpp>
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
@@ -58,8 +58,9 @@ namespace nglib {
 #include <nglib.h>
 }
 #ifndef OCCGEOMETRY
-    #define OCCGEOMETRY
-#endif // #ifndef OCCGEOMETRY
+# define OCCGEOMETRY
+#endif
+
 #include <occgeom.hpp>
 #include <meshing.hpp>
 //#include <meshtype.hpp>