mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
COMP: avoid deprecated headers for CGAL-6.0
This commit is contained in:
@ -97,7 +97,11 @@ Description
|
||||
#pragma clang diagnostic ignored "-Wbitwise-instead-of-logical"
|
||||
|
||||
#include <CGAL/AABB_tree.h>
|
||||
#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1060011000)
|
||||
#include <CGAL/AABB_traits.h>
|
||||
#else
|
||||
#include <CGAL/AABB_traits_3.h>
|
||||
#endif
|
||||
#include <CGAL/AABB_face_graph_triangle_primitive.h>
|
||||
#include "CGALIndexedPolyhedron.H"
|
||||
#include "PolyhedronReader.H"
|
||||
@ -105,7 +109,11 @@ typedef CGAL::AABB_face_graph_triangle_primitive
|
||||
<
|
||||
Polyhedron, CGAL::Default, CGAL::Tag_false
|
||||
> Primitive;
|
||||
#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1060011000)
|
||||
typedef CGAL::AABB_traits<K, Primitive> Traits;
|
||||
#else
|
||||
typedef CGAL::AABB_traits_3<K, Primitive> Traits;
|
||||
#endif
|
||||
typedef CGAL::AABB_tree<Traits> Tree;
|
||||
|
||||
// Used boost::optional prior to CGAL-6.0
|
||||
|
||||
Reference in New Issue
Block a user