From 707db0b65b514852b01f0feba9e9d13fea62fae6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 24 Mar 2025 15:50:43 +0100
Subject: [PATCH] COMP: avoid deprecated headers for CGAL-6.0
---
.../preProcessing/viewFactorsGen/viewFactorsGen.C | 10 ++++++++++
.../surfaceBooleanFeatures/surfaceBooleanFeatures.C | 8 ++++++++
2 files changed, 18 insertions(+)
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index a13eac5fea9..c1c0bce05e5 100644
--- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
+++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
@@ -105,8 +105,13 @@ Description
#include <vector>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/AABB_tree.h>
+#if defined(CGAL_VERSION_NR) && (CGAL_VERSION_NR < 1060011000)
#include <CGAL/AABB_traits.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>
typedef CGAL::Simple_cartesian<double> K;
@@ -116,8 +121,13 @@ typedef K::Triangle_3 Triangle;
typedef K::Segment_3 Segment;
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_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;
// Used boost::optional prior to CGAL-6.0
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index 009ce430eb0..16fdae77bd2 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -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
--
GitLab