suppress -Wmacro-redefined warnings caused by netgen headers
This commit is contained in:
@@ -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&);
|
||||
|
||||
@@ -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;
|
||||
|
||||
//=============================================================================
|
||||
|
||||
@@ -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;
|
||||
|
||||
//=============================================================================
|
||||
|
||||
@@ -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&);
|
||||
|
||||
@@ -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>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user