From a84957e4bbfaebd4f6c2df6153ad24dc5cd7c664 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Thu, 6 Nov 2025 16:30:12 +0100 Subject: [PATCH] fixing name collision --- AABB_tree/include/CGAL/AABB_traits_2.h | 12 ++++++------ AABB_tree/include/CGAL/AABB_traits_3.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/AABB_tree/include/CGAL/AABB_traits_2.h b/AABB_tree/include/CGAL/AABB_traits_2.h index 690225c4a1d..0ea44b81106 100644 --- a/AABB_tree/include/CGAL/AABB_traits_2.h +++ b/AABB_tree/include/CGAL/AABB_traits_2.h @@ -124,7 +124,7 @@ public: }; template -class Compare_distance { +class Compare_distance_2 { typedef typename GeomTraits::Point_2 Point; typedef typename GeomTraits::FT FT; @@ -206,9 +206,9 @@ class Compare_distance_getter_2 { // this class is in charge of checking what K provides (i.e., can we use filtered predicates, can we use statically filtered predicates, etc.) // depending on that it defines public: - typedef Compare_distance type; - static Compare_distance compare_distance_object() { - return Compare_distance(); + typedef Compare_distance_2 type; + static Compare_distance_2 compare_distance_object() { + return Compare_distance_2(); } }; @@ -224,8 +224,8 @@ class Compare_distance_getter_2 { typedef typename Kernel::C2E C2E; typedef typename Kernel::C2F C2F; - typedef Compare_distance Exact_functor; - typedef Compare_distance Filtered_functor; + typedef Compare_distance_2 Exact_functor; + typedef Compare_distance_2 Filtered_functor; public: typedef Filtered_predicate -class Compare_distance { +class Compare_distance_3 { typedef typename GeomTraits::Point_3 Point; typedef typename GeomTraits::FT FT; typedef typename GeomTraits::Boolean Boolean; @@ -258,9 +258,9 @@ class Compare_distance_getter_3 { // this class is in charge of checking what K provides (i.e., can we use filtered predicates, can we use statically filtered predicates, etc.) // depending on that it defines public: - typedef Compare_distance type; - static Compare_distance compare_distance_object() { - return Compare_distance(); + typedef Compare_distance_3 type; + static Compare_distance_3 compare_distance_object() { + return Compare_distance_3(); } }; @@ -276,8 +276,8 @@ class Compare_distance_getter_3 { typedef typename Kernel::C2E C2E; typedef typename Kernel::C2F C2F; - typedef Compare_distance Exact_functor; - typedef Compare_distance Filtered_functor; + typedef Compare_distance_3 Exact_functor; + typedef Compare_distance_3 Filtered_functor; public: typedef Filtered_predicate