From 6a6f663477fa7aadf8bc34bf593923c404f8eb22 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 4 Jul 2024 12:42:16 +0200 Subject: [PATCH] remove Default_constrained_Delaunay_triangulation_3_type_generator from doc --- .../Constrained_triangulation_3/PackageDescription.txt | 2 +- .../remesh_constrained_Delaunay_triangulation_3.cpp | 8 ++++---- .../Constrained_Delaunay_triangulation_cell_base_3.h | 1 + .../CGAL/make_constrained_Delaunay_triangulation_3.h | 9 +++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Constrained_triangulation_3/doc/Constrained_triangulation_3/PackageDescription.txt b/Constrained_triangulation_3/doc/Constrained_triangulation_3/PackageDescription.txt index 69e4a084649..f92657e4473 100644 --- a/Constrained_triangulation_3/doc/Constrained_triangulation_3/PackageDescription.txt +++ b/Constrained_triangulation_3/doc/Constrained_triangulation_3/PackageDescription.txt @@ -52,8 +52,8 @@ constrained triangulation class. \cgalCRPSubsection{Class Templates} +- `CGAL::Default_constrained_Delaunay_triangulation_3` - `CGAL::Constrained_Delaunay_triangulation_3` -- `CGAL::Default_constrained_Delaunay_triangulation_3_type_generator` - `CGAL::Constrained_Delaunay_triangulation_vertex_base_3` - `CGAL::Constrained_Delaunay_triangulation_cell_base_3` */ diff --git a/Constrained_triangulation_3/examples/Constrained_triangulation_3/remesh_constrained_Delaunay_triangulation_3.cpp b/Constrained_triangulation_3/examples/Constrained_triangulation_3/remesh_constrained_Delaunay_triangulation_3.cpp index 19e61c90889..aaec1d57dab 100644 --- a/Constrained_triangulation_3/examples/Constrained_triangulation_3/remesh_constrained_Delaunay_triangulation_3.cpp +++ b/Constrained_triangulation_3/examples/Constrained_triangulation_3/remesh_constrained_Delaunay_triangulation_3.cpp @@ -11,11 +11,11 @@ #include #include -using K = CGAL::Exact_predicates_inexact_constructions_kernel; -using Vb = CGAL::Constrained_Delaunay_triangulation_vertex_base_3; -using Cb = CGAL::Constrained_Delaunay_triangulation_cell_base_3; +using K = CGAL::Exact_predicates_inexact_constructions_kernel; +using Vb = CGAL::Constrained_Delaunay_triangulation_vertex_base_3; +using Cb = CGAL::Constrained_Delaunay_triangulation_cell_base_3; using Tds = CGAL::Triangulation_data_structure_3; -using Tr = CGAL::Triangulation_3; +using Tr = CGAL::Triangulation_3; using CDT = CGAL::Constrained_Delaunay_triangulation_3; int main(int argc, char* argv[]) diff --git a/Constrained_triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_cell_base_3.h b/Constrained_triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_cell_base_3.h index 4ac456822e8..e6f607fbde4 100644 --- a/Constrained_triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_cell_base_3.h +++ b/Constrained_triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_cell_base_3.h @@ -17,6 +17,7 @@ #include #include #include +#include namespace CGAL { diff --git a/Constrained_triangulation_3/include/CGAL/make_constrained_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/make_constrained_Delaunay_triangulation_3.h index 45f37652899..2e68cf2292f 100644 --- a/Constrained_triangulation_3/include/CGAL/make_constrained_Delaunay_triangulation_3.h +++ b/Constrained_triangulation_3/include/CGAL/make_constrained_Delaunay_triangulation_3.h @@ -22,6 +22,7 @@ namespace CGAL { +#ifndef DOXYGEN_RUNNING /*! * \ingroup PkgCT_3Classes * \brief The default 3D constrained Delaunay triangulation type. @@ -45,6 +46,7 @@ struct Default_constrained_Delaunay_triangulation_3_type_generator using Tr = Triangulation_3; using type = Constrained_Delaunay_triangulation_3; }; +#endif // DOXYGEN_RUNNING /*! * \ingroup PkgCT_3Classes @@ -54,10 +56,9 @@ struct Default_constrained_Delaunay_triangulation_3_type_generator * This alias template names the default 3D constrained Delaunay triangulation * type for a given geometric traits class. * - * \sa Default_constrained_Delaunay_triangulation_3_type_generator */ template -using Default_constrained_Delaunay_triangulation_3 = typename Default_constrained_Delaunay_triangulation_3_type_generator::type; +using Default_constrained_Delaunay_triangulation_3 = Constrained_Delaunay_triangulation_3, Constrained_Delaunay_triangulation_cell_base_3>>>; /*! * \ingroup PkgCT_3Functions @@ -86,7 +87,7 @@ using Default_constrained_Delaunay_triangulation_3 = typename Default_constraine * * If `Triangulation` is `CGAL::Default`, the geometric traits `Traits` is deduced from the polygon mesh type * `PolygonMesh` and the named parameters `NamedParameters`. And then the default constrained Delaunay triangulation is - * `Default_constrained_Delaunay_triangulation_3_type_generator::type`. + * `CGAL::Default_constrained_Delaunay_triangulation_3`. * * \param mesh The polygon mesh representing the constraints. * \param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below @@ -171,7 +172,7 @@ auto make_constrained_Delaunay_triangulation_3(const PolygonMesh& mesh, * * If `Triangulation` is `CGAL::Default`, the geometric traits `Traits` is deduced from the point type * in `PointRange` and the named parameters `NamedParameters`. And then the default constrained Delaunay triangulation - * is `Default_constrained_Delaunay_triangulation_3_type_generator::type`. + * is `CGAL::Default_constrained_Delaunay_triangulation_3`. * * \param points a range of points representing the vertices of the polygon soup * \param polygons a range of ranges of indices representing the faces of the polygon soup