From 9a12b3048efa7f23d393826eb109c7e292688ac4 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 8 Oct 2024 12:18:30 +0100 Subject: [PATCH 1/5] Triangulation_2: Do not include kernel header --- .../include/CGAL/Constrained_triangulation_2.h | 2 -- .../CGAL/Constrained_triangulation_plus_2.h | 16 +++++++++------- .../test/Triangulation_2/issue_3447.cpp | 3 ++- .../test/Triangulation_2/issue_5080.cpp | 2 ++ ...st_CDT_plus_2_with_Projection_traits_xy_3.cpp | 4 +++- ...test_cdt_2_projection_traits_special_case.cpp | 6 +++--- .../Triangulation_2/test_cdt_degenerate_case.cpp | 2 +- .../test_const_del_triangulation_2.cpp | 2 +- .../test_constrained_triangulation_2.cpp | 3 ++- ...est_constrained_triangulation_with_info_2.cpp | 3 ++- .../test_delaunay_hierarchy_2.cpp | 8 +++++--- .../test_delaunay_triangulation_2.cpp | 3 ++- .../test_delaunay_triangulation_proj.cpp | 8 +++++--- .../test_deprecated_projection_traits.cpp | 4 +++- .../test_regular_triangulation_2.cpp | 2 +- .../test_triangulation_with_zip_iterator_2.cpp | 4 +++- 16 files changed, 44 insertions(+), 28 deletions(-) diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h index 90d6448f0e5b..4441ca2e20d4 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h @@ -30,8 +30,6 @@ #include #include #include -#include -#include #include #include diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h index c3cd6d187dec..5c2ff7e52394 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h @@ -26,14 +26,16 @@ #include #include -#include #include + #include #include namespace CGAL { + class Epick; + // Comparison functor that compares two Vertex_handle. // Used as 'Compare' functor for the constraint hierarchy. template < class Tr > @@ -59,20 +61,20 @@ template < class Tr_ = Default > class Constrained_triangulation_plus_2 : public Default::Get< Tr_, Constrained_Delaunay_triangulation_2< - Exact_predicates_inexact_constructions_kernel + Epick , Triangulation_data_structure_2< - Triangulation_vertex_base_2 - , Constrained_triangulation_face_base_2 + Triangulation_vertex_base_2 + , Constrained_triangulation_face_base_2 > , CGAL::Exact_predicates_tag > >::type { typedef typename Default::Get< Tr_, Constrained_Delaunay_triangulation_2< - Exact_predicates_inexact_constructions_kernel + Epick , Triangulation_data_structure_2< - Triangulation_vertex_base_2 - , Constrained_triangulation_face_base_2 + Triangulation_vertex_base_2 + , Constrained_triangulation_face_base_2 > , CGAL::Exact_predicates_tag > >::type Tr; diff --git a/Triangulation_2/test/Triangulation_2/issue_3447.cpp b/Triangulation_2/test/Triangulation_2/issue_3447.cpp index e3b6e4218366..db05aa0e5467 100644 --- a/Triangulation_2/test/Triangulation_2/issue_3447.cpp +++ b/Triangulation_2/test/Triangulation_2/issue_3447.cpp @@ -1,7 +1,8 @@ -#include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; + typedef CGAL::Triangulation_vertex_base_2 Vb; typedef CGAL::Constrained_triangulation_face_base_2 Fb; typedef CGAL::Triangulation_data_structure_2 TDS; diff --git a/Triangulation_2/test/Triangulation_2/issue_5080.cpp b/Triangulation_2/test/Triangulation_2/issue_5080.cpp index 73a5e1481312..aedb90c8f2eb 100644 --- a/Triangulation_2/test/Triangulation_2/issue_5080.cpp +++ b/Triangulation_2/test/Triangulation_2/issue_5080.cpp @@ -6,6 +6,8 @@ #include #include +#include + template struct TriangulationTraitsTemplate_2 { diff --git a/Triangulation_2/test/Triangulation_2/test_CDT_plus_2_with_Projection_traits_xy_3.cpp b/Triangulation_2/test/Triangulation_2/test_CDT_plus_2_with_Projection_traits_xy_3.cpp index f9143da6ff8f..80d1760c70fb 100644 --- a/Triangulation_2/test/Triangulation_2/test_CDT_plus_2_with_Projection_traits_xy_3.cpp +++ b/Triangulation_2/test/Triangulation_2/test_CDT_plus_2_with_Projection_traits_xy_3.cpp @@ -1,7 +1,9 @@ -#include + #include #include #include +#include + #include typedef CGAL::Exact_predicates_inexact_constructions_kernel EIK; diff --git a/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp b/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp index 1f6638de00e3..e40d4b018759 100644 --- a/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp +++ b/Triangulation_2/test/Triangulation_2/test_cdt_2_projection_traits_special_case.cpp @@ -1,9 +1,9 @@ -#include -#include - #include #include +#include +#include + #include #include diff --git a/Triangulation_2/test/Triangulation_2/test_cdt_degenerate_case.cpp b/Triangulation_2/test/Triangulation_2/test_cdt_degenerate_case.cpp index 3c2bcf48f3ff..df7a23fdf274 100644 --- a/Triangulation_2/test/Triangulation_2/test_cdt_degenerate_case.cpp +++ b/Triangulation_2/test/Triangulation_2/test_cdt_degenerate_case.cpp @@ -1,8 +1,8 @@ #define CGAL_CDT_2_DEBUG_INTERSECTIONS 1 -#include #include #include #include +#include #include typedef CGAL::Exact_predicates_inexact_constructions_kernel EPIC; diff --git a/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp index a1852062240c..51b0c811581b 100644 --- a/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_const_del_triangulation_2.cpp @@ -22,8 +22,8 @@ #include -#include #include +#include #include // Explicit instantiation of the whole class : diff --git a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp index 89dd4e73888f..f8ec1403614d 100644 --- a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_2.cpp @@ -26,9 +26,10 @@ #define CGAL_NO_CDT_2_WARNING #include -#include #include +#include + #include static_assert(!CGAL::internal::can_construct_almost_exact_intersection_v, diff --git a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_with_info_2.cpp b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_with_info_2.cpp index d86f08e55b87..a8b5327f6200 100644 --- a/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_with_info_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_constrained_triangulation_with_info_2.cpp @@ -1,6 +1,7 @@ -#include #include #include +#include + #include #include diff --git a/Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp b/Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp index f82cb7a23ecb..a2dd86682a65 100644 --- a/Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp @@ -19,13 +19,15 @@ // // coordinator : INRIA Sophia-Antipolis // ============================================================================ -#include - -#include #include #include #include + +#include + +#include + #include typedef double Coord_type; diff --git a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp index f58585c4810c..59e2943738df 100644 --- a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp @@ -32,9 +32,10 @@ #include #include -#include + #include #include +#include #include #include diff --git a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_proj.cpp b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_proj.cpp index d539afe3ab63..6df29ee3872c 100644 --- a/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_proj.cpp +++ b/Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_proj.cpp @@ -1,12 +1,14 @@ -#include + #include #include #include #include -#include - #include +#include + +#include + typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef CGAL::Projection_traits_xy_3 Gt_xy; typedef CGAL::Projection_traits_yz_3 Gt_yz; diff --git a/Triangulation_2/test/Triangulation_2/test_deprecated_projection_traits.cpp b/Triangulation_2/test/Triangulation_2/test_deprecated_projection_traits.cpp index 84a8465162d6..d232cfe109ff 100644 --- a/Triangulation_2/test/Triangulation_2/test_deprecated_projection_traits.cpp +++ b/Triangulation_2/test/Triangulation_2/test_deprecated_projection_traits.cpp @@ -1,9 +1,11 @@ #include -#include + #include #include +#include + #include #include diff --git a/Triangulation_2/test/Triangulation_2/test_regular_triangulation_2.cpp b/Triangulation_2/test/Triangulation_2/test_regular_triangulation_2.cpp index 4b5be564167c..177d62ac3088 100644 --- a/Triangulation_2/test/Triangulation_2/test_regular_triangulation_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_regular_triangulation_2.cpp @@ -24,10 +24,10 @@ #include #include -#include #include +#include typedef CGAL::Exact_predicates_exact_constructions_kernel RGt; diff --git a/Triangulation_2/test/Triangulation_2/test_triangulation_with_zip_iterator_2.cpp b/Triangulation_2/test/Triangulation_2/test_triangulation_with_zip_iterator_2.cpp index c3e0a5a081c7..cdc0445c0d7e 100644 --- a/Triangulation_2/test/Triangulation_2/test_triangulation_with_zip_iterator_2.cpp +++ b/Triangulation_2/test/Triangulation_2/test_triangulation_with_zip_iterator_2.cpp @@ -1,6 +1,8 @@ -#include #include #include + +#include + #include #include #include From 1ccbbb783ae245a0d039d43c6943e49b4914cdf4 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 8 Oct 2024 12:53:59 +0100 Subject: [PATCH 2/5] Add missing #include (probably revealed by reordering of #includes) --- Triangulation_2/include/CGAL/Constrained_triangulation_2.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h index 4441ca2e20d4..d77322d74378 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h @@ -31,6 +31,7 @@ #include #include #include +#include #include #include From 9dc95119368eb64901596175e68fd03b60439232 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 8 Oct 2024 14:08:03 +0100 Subject: [PATCH 3/5] Add missing include --- Basic_viewer/include/CGAL/Buffer_for_vao.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Basic_viewer/include/CGAL/Buffer_for_vao.h b/Basic_viewer/include/CGAL/Buffer_for_vao.h index d7c9619619ad..6352236acf4e 100644 --- a/Basic_viewer/include/CGAL/Buffer_for_vao.h +++ b/Basic_viewer/include/CGAL/Buffer_for_vao.h @@ -15,6 +15,7 @@ #include +#include #include #include #include From 9346dc4bbc9522df0490b8dfb4af8470182992f1 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 8 Oct 2024 14:44:23 +0100 Subject: [PATCH 4/5] Fix dependencies.txt --- .../package_info/Barycentric_coordinates_2/dependencies | 3 --- Partition_2/package_info/Partition_2/dependencies | 3 --- Polygon_repair/package_info/Polygon_repair/dependencies | 3 --- .../package_info/Polyline_simplification_2/dependencies | 5 ----- .../package_info/Surface_mesh_parameterization/dependencies | 2 -- Visibility_2/package_info/Visibility_2/dependencies | 3 --- 6 files changed, 19 deletions(-) diff --git a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies index 09b948be599a..3778306dcb9c 100644 --- a/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies +++ b/Barycentric_coordinates_2/package_info/Barycentric_coordinates_2/dependencies @@ -1,9 +1,6 @@ Algebraic_foundations -Arithmetic_kernel BGL Barycentric_coordinates_2 -CGAL_Core -Cartesian_kernel Circulator Distance_2 Distance_3 diff --git a/Partition_2/package_info/Partition_2/dependencies b/Partition_2/package_info/Partition_2/dependencies index 2d383a64c885..6ff0abd837d2 100644 --- a/Partition_2/package_info/Partition_2/dependencies +++ b/Partition_2/package_info/Partition_2/dependencies @@ -1,7 +1,4 @@ Algebraic_foundations -Arithmetic_kernel -CGAL_Core -Cartesian_kernel Circulator Convex_hull_2 Distance_2 diff --git a/Polygon_repair/package_info/Polygon_repair/dependencies b/Polygon_repair/package_info/Polygon_repair/dependencies index 7e57c5ca79cd..8231db1007e1 100644 --- a/Polygon_repair/package_info/Polygon_repair/dependencies +++ b/Polygon_repair/package_info/Polygon_repair/dependencies @@ -1,7 +1,4 @@ Algebraic_foundations -Arithmetic_kernel -Cartesian_kernel -CGAL_Core Circulator Distance_2 Distance_3 diff --git a/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies b/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies index b1e47ef32221..117856fa8050 100644 --- a/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies +++ b/Polyline_simplification_2/package_info/Polyline_simplification_2/dependencies @@ -1,20 +1,15 @@ Algebraic_foundations -Arithmetic_kernel BGL -CGAL_Core -Cartesian_kernel Circulator Distance_2 Distance_3 Filtered_kernel Hash_map -Homogeneous_kernel Installation Intersections_2 Intersections_3 Interval_support Kernel_23 -Kernel_d Modular_arithmetic Number_types Polygon diff --git a/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies b/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies index d2906b564b4b..41240d76f489 100644 --- a/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies +++ b/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies @@ -1,8 +1,6 @@ Algebraic_foundations -Arithmetic_kernel BGL Box_intersection_d -CGAL_Core Cartesian_kernel Circulator Distance_2 diff --git a/Visibility_2/package_info/Visibility_2/dependencies b/Visibility_2/package_info/Visibility_2/dependencies index 2199ba4f76d3..7acbd2503036 100644 --- a/Visibility_2/package_info/Visibility_2/dependencies +++ b/Visibility_2/package_info/Visibility_2/dependencies @@ -1,8 +1,5 @@ Algebraic_foundations -Arithmetic_kernel Arrangement_on_surface_2 -CGAL_Core -Cartesian_kernel Circulator Distance_2 Distance_3 From 6f8f89ea375aca34bfd2eff6b1bd368f67572b98 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 8 Oct 2024 15:26:05 +0100 Subject: [PATCH 5/5] Remove Defaul --- .../CGAL/Constrained_triangulation_plus_2.h | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h index 5c2ff7e52394..74f12fa315eb 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -57,27 +56,11 @@ class Pct2_vertex_handle_less_xy { // Tr the base triangulation class // Tr has to be Constrained or Constrained_Delaunay with Constrained_triangulation_plus_vertex_base -template < class Tr_ = Default > +template < class Tr_> class Constrained_triangulation_plus_2 - : public -Default::Get< Tr_, Constrained_Delaunay_triangulation_2< - Epick - , Triangulation_data_structure_2< - Triangulation_vertex_base_2 - , Constrained_triangulation_face_base_2 - > - , CGAL::Exact_predicates_tag - > >::type + : public Tr_ { - typedef typename - Default::Get< Tr_, Constrained_Delaunay_triangulation_2< - Epick - , Triangulation_data_structure_2< - Triangulation_vertex_base_2 - , Constrained_triangulation_face_base_2 - > - , CGAL::Exact_predicates_tag - > >::type Tr; + typedef Tr_ Tr; template