diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H index 277bd836d2a4ea066d35adc2f3687d2897bd14e1..c925db63bfeb77c64f1d706566f8521119ddfe6a 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/CGALTriangulation3DKernel.H @@ -33,7 +33,13 @@ Description #ifndef CGALTriangulation3DKernel_H #define CGALTriangulation3DKernel_H -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Silence boost bind deprecation warnings (before CGAL-5.2.1) +#include "CGAL/version.h" +#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1050211000) +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif + +// ------------------------------------------------------------------------- // #include "CGAL/Delaunay_triangulation_3.h" diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H index ceaf04946bd3012a6f8a8470f967032ea59b3c68..1e2f011d51c0778e7018925d718d9b309792a13c 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCell.H @@ -36,8 +36,16 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef indexedCell_H -#define indexedCell_H +#ifndef Foam_CGAL_indexedCell_H +#define Foam_CGAL_indexedCell_H + +// Silence boost bind deprecation warnings (before CGAL-5.2.1) +#include "CGAL/version.h" +#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1050211000) +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif + +// ------------------------------------------------------------------------- // #include "CGAL/Triangulation_3.h" #include "CGAL/Delaunay_triangulation_cell_base_with_circumcenter_3.h" diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H index 22271ebe6aed3bb61bbfab7bf4dad4d1f21b2fb1..9eda658ae37566df8759fb5ebb442a460c1eac81 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H @@ -37,8 +37,16 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef indexedVertex_H -#define indexedVertex_H +#ifndef Foam_CGAL_indexedVertex_H +#define Foam_CGAL_indexedVertex_H + +// Silence boost bind deprecation warnings (before CGAL-5.2.1) +#include "CGAL/version.h" +#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1050211000) +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif + +// ------------------------------------------------------------------------- // #include "CGAL/Triangulation_3.h" #include "CGALTriangulation3DKernel.H" diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H index 16c059bd4449001ea25fc4a3c3f65ff2893d2ef9..97e450eb35c7e6f494d4ab80648905a277ce1572 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CGALTriangulation2DKernel.H @@ -33,10 +33,18 @@ Description #ifndef CGALTriangulation2DKernel_H #define CGALTriangulation2DKernel_H -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Silence boost bind deprecation warnings (before CGAL-5.2.1) +#include "CGAL/version.h" +#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1050211000) +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif + +// ------------------------------------------------------------------------- // #include "CGAL/Delaunay_triangulation_2.h" +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #ifdef CGAL_INEXACT // Fast kernel using a double as the storage type but the triangulation diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H index fc44afe875f5b3b8c64ccb6b5fff4df513371742..d57fbc34d45b96d8b335f445a3cdc54c14b9d346 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedFace.H @@ -32,10 +32,9 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef indexedFace_H -#define indexedFace_H +#ifndef Foam_CGAL_indexedFace_H +#define Foam_CGAL_indexedFace_H -#include "CGAL/Triangulation_2.h" #include "indexedVertex.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H index 3610d514d13241acb5a1054ab4304dfdf900ae36..0cb062bb5a6235e62c8975bae981a7bffd58de72 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/indexedVertex.H @@ -32,8 +32,16 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef indexedVertex_H -#define indexedVertex_H +#ifndef Foam_CGAL_indexedVertex_H +#define Foam_CGAL_indexedVertex_H + +// Silence boost bind deprecation warnings (before CGAL-5.2.1) +#include "CGAL/version.h" +#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1050211000) +#define BOOST_BIND_GLOBAL_PLACEHOLDERS +#endif + +// ------------------------------------------------------------------------- // #include "CGAL/Triangulation_2.h"