Triangulation_2: Do not include kernel header (#8527)

## Summary of Changes Do not include `Exact_predicates_inexact_constructions_kernel.h` and `Simple_cartesian.h`. Change order of `#include` statements so that the T2 files come first. Forward declare `Epick` in `Constrained_triangulation_plus_2` where it is used for defining a `Default` for the template parameter (which is not documented). ## Release Management * Affected package(s): Triangulation_2 * License and copyright ownership: unchanged.
CGAL · Nov 8, 2024 · 25afb37 · 25afb37
2 parents 797dde5 + 584c7dd
commit 25afb37
Show file tree

Hide file tree

Showing 23 changed files with 41 additions and 61 deletions.
diff --git 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/Basic_viewer/include/CGAL/Buffer_for_vao.h b/Basic_viewer/include/CGAL/Buffer_for_vao.h
@@ -15,6 +15,7 @@
 
 #include <CGAL/license/GraphicsView.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Projection_traits_3.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
 #include <CGAL/Triangulation_face_base_with_info_2.h>

diff --git 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
@@ -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
@@ -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
@@ -1,8 +1,6 @@
 Algebraic_foundations
-Arithmetic_kernel
 BGL
 Box_intersection_d
-CGAL_Core
 Cartesian_kernel
 Circulator
 Distance_2

diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h
@@ -30,9 +30,8 @@
 #include <CGAL/intersections.h>
 #include <CGAL/squared_distance_2.h>
 #include <CGAL/tags.h>
-#include <CGAL/Simple_cartesian.h>
-#include <CGAL/Exact_rational.h>
 #include <CGAL/Kernel_23/internal/Has_boolean_tags.h>
+#include <CGAL/NT_converter.h>
 
 #include <boost/mpl/has_xxx.hpp>
 #include <boost/iterator/filter_iterator.hpp>

diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
@@ -24,10 +24,9 @@
 #include <CGAL/Triangulation_2/internal/CTP2_subconstraint_graph.h>
 #include <boost/tuple/tuple.hpp>
 
-#include <CGAL/Default.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Triangulation_2/insert_constraints.h>
+
 #include <boost/container/flat_set.hpp>
 
 #include <type_traits>
@@ -55,27 +54,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<
-                      Exact_predicates_inexact_constructions_kernel
-                      , Triangulation_data_structure_2<
-                            Triangulation_vertex_base_2<Exact_predicates_inexact_constructions_kernel>
-                          , Constrained_triangulation_face_base_2<Exact_predicates_inexact_constructions_kernel>
-                          >
-                      , CGAL::Exact_predicates_tag
-                      > >::type
+  : public Tr_
 {
-  typedef typename
-  Default::Get< Tr_, Constrained_Delaunay_triangulation_2<
-                  Exact_predicates_inexact_constructions_kernel
-                  , Triangulation_data_structure_2<
-                        Triangulation_vertex_base_2<Exact_predicates_inexact_constructions_kernel>
-                      , Constrained_triangulation_face_base_2<Exact_predicates_inexact_constructions_kernel>
-                      >
-                  , CGAL::Exact_predicates_tag
-                  > >::type Tr;
+  typedef Tr_ Tr;
 
 
   template<class CDT>

diff --git a/Triangulation_2/test/Triangulation_2/issue_3447.cpp b/Triangulation_2/test/Triangulation_2/issue_3447.cpp
@@ -1,7 +1,8 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
+
 typedef CGAL::Triangulation_vertex_base_2<K> Vb;
 typedef CGAL::Constrained_triangulation_face_base_2<K> Fb;
 typedef CGAL::Triangulation_data_structure_2<Vb, Fb>           TDS;

diff --git a/Triangulation_2/test/Triangulation_2/issue_5080.cpp b/Triangulation_2/test/Triangulation_2/issue_5080.cpp
@@ -6,6 +6,8 @@
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 template<typename VertexInfoType, typename FaceInfoType, typename Itag>
 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
@@ -1,7 +1,9 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
 #include <CGAL/Projection_traits_xy_3.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <cassert>
 
 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
@@ -1,9 +1,9 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Projection_traits_3.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 #include <CGAL/Triangulation_2_projection_traits_3.h>
 

diff --git 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 <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
 #include <CGAL/Base_with_time_stamp.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <iostream>
 
 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
@@ -22,8 +22,8 @@
 
 #include <CGAL/_test_types.h>
 
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/_test_cls_const_Del_triangulation_2.h>
 
 // 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
@@ -26,9 +26,10 @@
 #define CGAL_NO_CDT_2_WARNING
 
 #include <CGAL/_test_types.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <CGAL/Constrained_triangulation_2.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <CGAL/_test_cls_constrained_triangulation_2.h>
 
 static_assert(!CGAL::internal::can_construct_almost_exact_intersection_v<EK>,

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
@@ -1,6 +1,7 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <vector>
 #include <cassert>
 

diff --git 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 <iostream>
-
-#include <CGAL/Simple_cartesian.h>
 
 #include <CGAL/Triangulation_data_structure_2.h>
 #include <CGAL/Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_hierarchy_2.h>
+
+#include <CGAL/Simple_cartesian.h>
+
+#include <iostream>
+
 #include <CGAL/_test_cls_delaunay_hierarchy_2.h>
 
 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
@@ -32,9 +32,10 @@
 #include <iostream>
 
 #include <CGAL/_test_types.h>
-#include <CGAL/Cartesian.h>
+
 #include <CGAL/Triangulation_data_structure_2.h>
 #include <CGAL/Delaunay_triangulation_2.h>
+#include <CGAL/Cartesian.h>
 
 #include <CGAL/_test_traits.h>
 #include <CGAL/_test_cls_delaunay_triangulation_2.h>

diff --git 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 <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/Projection_traits_xy_3.h>
 #include <CGAL/Projection_traits_yz_3.h>
 #include <CGAL/Projection_traits_xz_3.h>
 #include <CGAL/Delaunay_triangulation_2.h>
-#include <iostream>
-
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
+#include <iostream>
+
 typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
 typedef CGAL::Projection_traits_xy_3<Kernel>   Gt_xy;
 typedef CGAL::Projection_traits_yz_3<Kernel>   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
@@ -1,9 +1,11 @@
 #include <CGAL/Installation/internal/disable_deprecation_warnings_and_errors.h>
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Triangulation_2_projection_traits_3.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <iostream>
 #include <vector>
 

diff --git 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 <CGAL/_test_types.h>
 
 #include <CGAL/Regular_triangulation_2.h>
-#include <CGAL/_test_cls_regular_triangulation_2.h>
 
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
+#include <CGAL/_test_cls_regular_triangulation_2.h>
 
 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
@@ -1,6 +1,8 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Triangulation_2.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <boost/iterator/zip_iterator.hpp>
 #include <vector>
 #include <cassert>

diff --git 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