From 55c564558f8eb1cb7c82d2bb0bc07619b01e24e3 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 6 Oct 2023 14:15:02 +0100 Subject: [PATCH] Move code to internal folder/namespace --- .../include/CGAL/Polygon_repair/Polygon_repair.h | 8 ++++---- .../Triangulation_face_base_with_repair_info_2.h | 4 ++++ .../Triangulation_with_odd_even_constraints_2.h | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) rename Polygon_repair/include/CGAL/Polygon_repair/{ => internal}/Triangulation_face_base_with_repair_info_2.h (94%) rename Polygon_repair/include/CGAL/Polygon_repair/{ => internal}/Triangulation_with_odd_even_constraints_2.h (97%) diff --git a/Polygon_repair/include/CGAL/Polygon_repair/Polygon_repair.h b/Polygon_repair/include/CGAL/Polygon_repair/Polygon_repair.h index 5264913eb03..e703ce7e842 100644 --- a/Polygon_repair/include/CGAL/Polygon_repair/Polygon_repair.h +++ b/Polygon_repair/include/CGAL/Polygon_repair/Polygon_repair.h @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include namespace CGAL { @@ -276,13 +276,13 @@ class Polygon_repair { public: using Vertex_base = CGAL::Triangulation_vertex_base_2; using Face_base = CGAL::Constrained_triangulation_face_base_2; - using Face_base_with_repair_info = CGAL::Triangulation_face_base_with_repair_info_2; + using Face_base_with_repair_info = internal::Triangulation_face_base_with_repair_info_2; using Triangulation_data_structure = CGAL::Triangulation_data_structure_2; using Tag = typename std::conditional::value, CGAL::Exact_predicates_tag, CGAL::Exact_intersections_tag>::type; using Constrained_Delaunay_triangulation = CGAL::Constrained_Delaunay_triangulation_2; - using Triangulation = Triangulation_with_odd_even_constraints_2; + using Triangulation = internal::Triangulation_with_odd_even_constraints_2; // TODO: Edge_map and Vertex_map use std::set and set::map with exact kernels since Point_2 can't be hashed otherwise using Edge_map = typename std::conditional::value, std::unordered_set, diff --git a/Polygon_repair/include/CGAL/Polygon_repair/Triangulation_face_base_with_repair_info_2.h b/Polygon_repair/include/CGAL/Polygon_repair/internal/Triangulation_face_base_with_repair_info_2.h similarity index 94% rename from Polygon_repair/include/CGAL/Polygon_repair/Triangulation_face_base_with_repair_info_2.h rename to Polygon_repair/include/CGAL/Polygon_repair/internal/Triangulation_face_base_with_repair_info_2.h index 61389d4e33e..0f148279548 100644 --- a/Polygon_repair/include/CGAL/Polygon_repair/Triangulation_face_base_with_repair_info_2.h +++ b/Polygon_repair/include/CGAL/Polygon_repair/internal/Triangulation_face_base_with_repair_info_2.h @@ -17,6 +17,8 @@ #include namespace CGAL { +namespace Polygon_repair { +namespace internal { template > class Triangulation_face_base_with_repair_info_2 : public FaceBase { @@ -47,6 +49,8 @@ public: int& label() { return _label; } }; +} // namespace internal +} // namespace Polygon_repair } //namespace CGAL #endif // CGAL_TRIANGULATION_WITH_REPAIR_INFO_2_H diff --git a/Polygon_repair/include/CGAL/Polygon_repair/Triangulation_with_odd_even_constraints_2.h b/Polygon_repair/include/CGAL/Polygon_repair/internal/Triangulation_with_odd_even_constraints_2.h similarity index 97% rename from Polygon_repair/include/CGAL/Polygon_repair/Triangulation_with_odd_even_constraints_2.h rename to Polygon_repair/include/CGAL/Polygon_repair/internal/Triangulation_with_odd_even_constraints_2.h index 3d5dd2a77e4..563527a48fb 100644 --- a/Polygon_repair/include/CGAL/Polygon_repair/Triangulation_with_odd_even_constraints_2.h +++ b/Polygon_repair/include/CGAL/Polygon_repair/internal/Triangulation_with_odd_even_constraints_2.h @@ -16,6 +16,8 @@ #include namespace CGAL { +namespace Polygon_repair { +namespace internal { template class Triangulation_with_odd_even_constraints_2 : public Triangulation_ { @@ -122,6 +124,8 @@ public: } }; +} // namespace internal +} // namespace Polygon_repair } // namespace CGAL #endif // CGAL_TRIANGULATION_WITH_ODD_EVEN_CONSTRAINTS_2_H