zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: avoid deprecated headers for CGAL-6.0

Browse Source
This commit is contained in:
Mark Olesen
2025-03-24 15:50:43 +01:00
parent 8716795d86
commit 707db0b65b
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
View File

@ -105,8 +105,13 @@ Description
#include <vector> #include <vector>
#include <CGAL/Simple_cartesian.h> #include <CGAL/Simple_cartesian.h>
#include <CGAL/AABB_tree.h> #include <CGAL/AABB_tree.h>
#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1060011000)
#include <CGAL/AABB_traits.h> #include <CGAL/AABB_traits.h>
#include <CGAL/AABB_triangle_primitive.h> #include <CGAL/AABB_triangle_primitive.h>
#else
#include <CGAL/AABB_traits_3.h>
#include <CGAL/AABB_triangle_primitive_3.h>
#endif
#include <CGAL/Surface_mesh.h> #include <CGAL/Surface_mesh.h>
typedef CGAL::Simple_cartesian<double> K; typedef CGAL::Simple_cartesian<double> K;
@ -116,8 +121,13 @@ typedef K::Triangle_3 Triangle;
typedef K::Segment_3 Segment; typedef K::Segment_3 Segment;
typedef std::vector<Triangle>::iterator Iterator; typedef std::vector<Triangle>::iterator Iterator;
#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1060011000)
typedef CGAL::AABB_triangle_primitive<K, Iterator> Primitive; typedef CGAL::AABB_triangle_primitive<K, Iterator> Primitive;
typedef CGAL::AABB_traits<K, Primitive> AABB_triangle_traits; typedef CGAL::AABB_traits<K, Primitive> AABB_triangle_traits;
#else
typedef CGAL::AABB_triangle_primitive_3<K, Iterator> Primitive;
typedef CGAL::AABB_traits_3<K, Primitive> AABB_triangle_traits;
#endif
typedef CGAL::AABB_tree<AABB_triangle_traits> Tree; typedef CGAL::AABB_tree<AABB_triangle_traits> Tree;
// Used boost::optional prior to CGAL-6.0 // Used boost::optional prior to CGAL-6.0

8
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -97,7 +97,11 @@ Description
#pragma clang diagnostic ignored "-Wbitwise-instead-of-logical" #pragma clang diagnostic ignored "-Wbitwise-instead-of-logical"
#include <CGAL/AABB_tree.h> #include <CGAL/AABB_tree.h>
#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1060011000)
#include <CGAL/AABB_traits.h> #include <CGAL/AABB_traits.h>
#else
#include <CGAL/AABB_traits_3.h>
#endif
#include <CGAL/AABB_face_graph_triangle_primitive.h> #include <CGAL/AABB_face_graph_triangle_primitive.h>
#include "CGALIndexedPolyhedron.H" #include "CGALIndexedPolyhedron.H"
#include "PolyhedronReader.H" #include "PolyhedronReader.H"
@ -105,7 +109,11 @@ typedef CGAL::AABB_face_graph_triangle_primitive
< <
Polyhedron, CGAL::Default, CGAL::Tag_false Polyhedron, CGAL::Default, CGAL::Tag_false
> Primitive; > Primitive;
#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1060011000)
typedef CGAL::AABB_traits<K, Primitive> Traits; typedef CGAL::AABB_traits<K, Primitive> Traits;
#else
typedef CGAL::AABB_traits_3<K, Primitive> Traits;
#endif
typedef CGAL::AABB_tree<Traits> Tree; typedef CGAL::AABB_tree<Traits> Tree;
// Used boost::optional prior to CGAL-6.0 // Used boost::optional prior to CGAL-6.0