Commit aed1d11d authored by Jan Möbius's avatar Jan Möbius

Merge branch 'fix_guard' into 'master'

TriangleBSP: fix preprocessor guard

See merge request !143
parents ab592ac7 0fcac05a
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
// //
//============================================================================= //=============================================================================
#ifndef MB_TRIANGLEBSP_HH #pragma once
#define MB_TRIANGLEBSP_HH
//== INCLUDES ================================================================= //== INCLUDES =================================================================
...@@ -222,7 +221,10 @@ public: ...@@ -222,7 +221,10 @@ public:
}; };
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT #if (defined ENABLE_POLYHEDRALMESH_SUPPORT) \
|| (defined ENABLE_HEXAHEDRALMESH_SUPPORT) \
|| (defined ENABLE_TETRAHEDRALMESH_SUPPORT)
#include <OpenVolumeMesh/Core/PropertyHandles.hh> #include <OpenVolumeMesh/Core/PropertyHandles.hh>
//== CLASS DEFINITION ========================================================= //== CLASS DEFINITION =========================================================
...@@ -268,9 +270,5 @@ public: ...@@ -268,9 +270,5 @@ public:
: Base(Traits(_mesh), _infinity) {} : Base(Traits(_mesh), _infinity) {}
}; };
#endif // ENABLE_OPENVOLUMEMESH #endif
//=============================================================================
#endif // MB_TRIANGLEBSP_HH defined
//=============================================================================
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment