From 28ab8e9293515645c14d3af88ceffa1830b81e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 4 Jan 2022 11:19:05 +0100 Subject: [PATCH] replace CGAL_PMP_NP macros with CGAL_BGL_NP ones --- .../doc/Polygon_mesh_processing/Doxyfile.in | 6 -- .../CGAL/Polygon_mesh_processing/bbox.h | 21 ++--- .../CGAL/Polygon_mesh_processing/border.h | 2 +- .../Polygon_mesh_processing/compute_normal.h | 2 +- .../connected_components.h | 24 +++--- .../CGAL/Polygon_mesh_processing/distance.h | 2 +- .../CGAL/Polygon_mesh_processing/extrude.h | 9 +-- .../CGAL/Polygon_mesh_processing/fair.h | 2 +- .../internal/Smoothing/curvature_flow_impl.h | 2 +- .../internal/Snapping/helper.h | 2 +- .../internal/Snapping/snap.h | 10 +-- .../internal/Snapping/snap_vertices.h | 2 +- .../internal/named_function_params.h | 26 ------- .../Polygon_mesh_processing/manifoldness.h | 2 +- .../CGAL/Polygon_mesh_processing/measure.h | 77 +++++++++---------- .../merge_border_vertices.h | 2 +- .../Polygon_mesh_processing/orientation.h | 2 +- .../random_perturbation.h | 2 +- .../CGAL/Polygon_mesh_processing/refine.h | 2 +- .../CGAL/Polygon_mesh_processing/remesh.h | 2 +- .../repair_degeneracies.h | 16 ++-- .../repair_polygon_soup.h | 2 +- .../repair_self_intersections.h | 4 +- .../self_intersections.h | 15 ++-- .../shape_predicates.h | 2 +- .../Polygon_mesh_processing/smooth_mesh.h | 9 +-- .../Polygon_mesh_processing/smooth_shape.h | 9 +-- .../Polygon_mesh_processing/stitch_borders.h | 59 +++++++------- .../CGAL/Polygon_mesh_processing/transform.h | 2 +- .../triangulate_faces.h | 2 +- .../triangulate_hole.h | 11 +-- .../include/CGAL/Polyhedral_envelope.h | 11 +-- .../Polyhedron/Plugins/IO/VTK_io_plugin.cpp | 2 +- .../Plugins/PMP/Hole_filling_plugin.cpp | 2 +- .../include/CGAL/IO/read_surf_trianglemesh.h | 2 +- .../doc/Tetrahedral_remeshing/Doxyfile.in | 5 -- 36 files changed, 131 insertions(+), 221 deletions(-) delete mode 100644 Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Doxyfile.in b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Doxyfile.in index 6d2633d9143..4f0c8360bbf 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Doxyfile.in +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Doxyfile.in @@ -13,12 +13,6 @@ ALIASES += "cgalDescribePolylineType=A polyline is defined as a sequence of poin EXAMPLE_PATH += ${CGAL_Poisson_surface_reconstruction_3_EXAMPLE_DIR} -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = YES -EXPAND_AS_DEFINED = CGAL_PMP_NP_TEMPLATE_PARAMETERS \ - CGAL_PMP_NP_CLASS \ - CGAL_DEPRECATED - EXCLUDE = ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/Polygon_mesh_processing/internal EXCLUDE_SYMBOLS += experimental diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h index 2552c903e87..2a24765e806 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h @@ -20,16 +20,9 @@ #include -#include +#include #include - -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#define CGAL_DEPRECATED -#endif - namespace CGAL { namespace Polygon_mesh_processing { @@ -64,18 +57,18 @@ namespace CGAL { * * @return a bounding box of `pmesh` */ - template + template CGAL::Bbox_3 bbox(const PolygonMesh& pmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { using parameters::choose_parameter; using parameters::get_parameter; - typename GetVertexPointMap::const_type + typename GetVertexPointMap::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, pmesh)); - typedef typename GetGeomTraits::type GT; + typedef typename GetGeomTraits::type GT; GT gt = choose_parameter(get_parameter(np, internal_np::geom_traits)); typename GT::Construct_bbox_3 get_bbox = gt.construct_bbox_3_object(); @@ -283,9 +276,9 @@ namespace CGAL { * \ingroup PkgPolygonMeshProcessingRef * \deprecated This function is deprecated since \cgal 4.10, `CGAL::Polygon_mesh_processing::bbox()` should be used instead. */ - template + template CGAL_DEPRECATED CGAL::Bbox_3 bbox_3(const PolygonMesh& pmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { return bbox(pmesh, np); } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h index 6f8c0cb9081..0deb75d1082 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h index 0f5840f6667..4b25a2f3ef0 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h index 581afe1978d..eb863bbbba3 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h @@ -41,15 +41,9 @@ #include #include -#include +#include #include -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - - namespace CGAL { namespace Polygon_mesh_processing{ namespace internal { @@ -321,9 +315,9 @@ namespace internal { // * // */ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> std::size_t number_of_connected_components(const PolygonMesh& pmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::faces_size_type faces_size_type; typedef CGAL::dynamic_face_property_t Face_property_tag; @@ -917,10 +911,10 @@ void remove_connected_components(PolygonMesh& pmesh */ template + , typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> void remove_connected_components(PolygonMesh& pmesh , const FaceRange& components_to_remove - , const CGAL_PMP_NP_CLASS& np) + , const CGAL_BGL_NP_CLASS& np) { using parameters::choose_parameter; using parameters::get_parameter; @@ -931,7 +925,7 @@ void remove_connected_components(PolygonMesh& pmesh typedef PolygonMesh PM; typedef typename boost::graph_traits::face_descriptor face_descriptor; - typedef typename CGAL::GetInitializedFaceIndexMap::type FaceIndexMap; + typedef typename CGAL::GetInitializedFaceIndexMap::type FaceIndexMap; FaceIndexMap fim = CGAL::get_initialized_face_index_map(pmesh, np); boost::vector_property_map face_cc(static_cast(num_faces(pmesh)), fim); @@ -987,10 +981,10 @@ void remove_connected_components(PolygonMesh& pmesh */ template + , typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> void keep_connected_components(PolygonMesh& pmesh , const FaceRange& components_to_keep - , const CGAL_PMP_NP_CLASS& np) + , const CGAL_BGL_NP_CLASS& np) { typedef PolygonMesh PM; typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -998,7 +992,7 @@ void keep_connected_components(PolygonMesh& pmesh using parameters::choose_parameter; using parameters::get_parameter; - typedef typename CGAL::GetInitializedFaceIndexMap::type FaceIndexMap; + typedef typename CGAL::GetInitializedFaceIndexMap::type FaceIndexMap; FaceIndexMap fim = CGAL::get_initialized_face_index_map(pmesh, np); boost::vector_property_map face_cc(static_cast(num_faces(pmesh)), fim); diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h index 276192739ea..7775505222d 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h index 0a375b028a9..330207f47c3 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h @@ -25,11 +25,6 @@ #include #include -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - namespace CGAL { namespace Polygon_mesh_processing { namespace extrude_impl{ @@ -320,11 +315,11 @@ void extrude_mesh(const InputMesh& input, template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> void extrude_mesh(const InputMesh& input, OutputMesh& output, Vector dir, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { extrude_mesh(input, output, dir, np, diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h index b6e9d00b9d0..491fa383d9d 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h index fa600557af3..0415cec2ee3 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h index 0c3fc465392..0e9d9c21b7f 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include namespace CGAL { diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h index 490cc457b13..5adb92b32db 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -1371,10 +1371,10 @@ std::size_t snap_borders(TriangleMesh& tm_A, template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> std::size_t snap_borders(TriangleMesh& tm, ToleranceMap tolerance_map, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1397,9 +1397,9 @@ std::size_t snap_borders(TriangleMesh& tm, template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> std::size_t snap_borders(TriangleMesh& tm, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h index 98aa23f2862..2e968f151ca 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h @@ -22,7 +22,7 @@ #endif #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h deleted file mode 100644 index 52b528a889f..00000000000 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2015 GeometryFactory (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial -// -// -// Author(s) : Jane Tournois - -#ifndef CGAL_PMP_BGL_NAMED_FUNCTION_PARAMS_H -#define CGAL_PMP_BGL_NAMED_FUNCTION_PARAMS_H - -#include - - -#include - -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS CGAL_BGL_NP_TEMPLATE_PARAMETERS -#define CGAL_PMP_NP_CLASS CGAL_BGL_NP_CLASS - -namespace CGAL { namespace Polygon_mesh_processing { namespace parameters = CGAL::parameters; } } - -#endif //CGAL_PMP_BGL_NAMED_FUNCTION_PARAMS_H diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h index 351019d5b11..3ab4edb3e5e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h @@ -15,7 +15,7 @@ #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h index 6d9533b2226..8416fbf1198 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include @@ -35,16 +35,11 @@ #include #include -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - namespace CGAL { // workaround for area(face_range, tm) overload -template -class GetGeomTraits +template +class GetGeomTraits { public: struct type{}; @@ -454,15 +449,15 @@ longest_border(const PolygonMesh& pmesh) * @sa `area()` */ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> #ifdef DOXYGEN_RUNNING FT #else -typename GetGeomTraits::type::FT +typename GetGeomTraits::type::FT #endif face_area(typename boost::graph_traits::face_descriptor f, const TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { using parameters::choose_parameter; using parameters::get_parameter; @@ -471,14 +466,14 @@ face_area(typename boost::graph_traits::face_descriptor f, CGAL_precondition(boost::graph_traits::null_face() != f); - typename GetVertexPointMap::const_type + typename GetVertexPointMap::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, tmesh)); halfedge_descriptor hd = halfedge(f, tmesh); halfedge_descriptor nhd = next(hd, tmesh); - typedef typename GetGeomTraits::type GT; + typedef typename GetGeomTraits::type GT; GT traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); return approximate_sqrt(traits.compute_squared_area_3_object()(get(vpm, source(hd, tmesh)), @@ -534,15 +529,15 @@ face_area(typename boost::graph_traits::face_descriptor f, * @sa `face_area()` */ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> #ifdef DOXYGEN_RUNNING FT #else -typename GetGeomTraits::type::FT +typename GetGeomTraits::type::FT #endif squared_face_area(typename boost::graph_traits::face_descriptor f, const TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { using parameters::choose_parameter; using parameters::get_parameter; @@ -551,14 +546,14 @@ squared_face_area(typename boost::graph_traits::face_descriptor f, CGAL_precondition(boost::graph_traits::null_face() != f); - typename GetVertexPointMap::const_type + typename GetVertexPointMap::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, tmesh)); halfedge_descriptor hd = halfedge(f, tmesh); halfedge_descriptor nhd = next(hd, tmesh); - typedef typename GetGeomTraits::type GT; + typedef typename GetGeomTraits::type GT; GT traits = choose_parameter(get_parameter(np, internal_np::geom_traits)); return traits.compute_squared_area_3_object()(get(vpm, source(hd, tmesh)), @@ -621,19 +616,19 @@ squared_face_area(typename boost::graph_traits::face_descriptor f, */ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> #ifdef DOXYGEN_RUNNING FT #else -typename GetGeomTraits::type::FT +typename GetGeomTraits::type::FT #endif area(FaceRange face_range, const TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::face_descriptor face_descriptor; - typename GetGeomTraits::type::FT result = 0; + typename GetGeomTraits::type::FT result = 0; for(face_descriptor f : face_range) { result += face_area(f, tmesh, np); @@ -689,13 +684,13 @@ area(FaceRange face_range, const TriangleMesh& tmesh) * @sa `face_area()` */ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> #ifdef DOXYGEN_RUNNING FT #else -typename GetGeomTraits::type::FT +typename GetGeomTraits::type::FT #endif -area(const TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np) +area(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np) { return area(faces(tmesh), tmesh, np); } @@ -744,14 +739,14 @@ area(const TriangleMesh& tmesh) * of `tmesh`. */ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> #ifdef DOXYGEN_RUNNING FT #else -typename GetGeomTraits::type::FT +typename GetGeomTraits::type::FT #endif volume(const TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { CGAL_assertion(is_triangle_mesh(tmesh)); CGAL_assertion(is_closed(tmesh)); @@ -759,14 +754,14 @@ volume(const TriangleMesh& tmesh, using parameters::choose_parameter; using parameters::get_parameter; - typename GetVertexPointMap::const_type + typename GetVertexPointMap::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, tmesh)); - typename GetGeomTraits::type::Point_3 origin(0, 0, 0); + typename GetGeomTraits::type::Point_3 origin(0, 0, 0); typedef typename boost::graph_traits::face_descriptor face_descriptor; - typename GetGeomTraits::type::FT volume = 0; + typename GetGeomTraits::type::FT volume = 0; typename CGAL::Kernel_traits::type>::Kernel::Compute_volume_3 cv3; @@ -825,27 +820,27 @@ volume(const TriangleMesh& tmesh) * */ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> #ifdef DOXYGEN_RUNNING FT #else -typename GetGeomTraits::type::FT +typename GetGeomTraits::type::FT #endif face_aspect_ratio(typename boost::graph_traits::face_descriptor f, const TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { CGAL_precondition(is_triangle(f, tmesh)); typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; - typedef typename GetGeomTraits::type Geom_traits; + typedef typename GetGeomTraits::type Geom_traits; typedef typename Geom_traits::FT FT; using parameters::choose_parameter; using parameters::get_parameter; - typename GetVertexPointMap::const_type + typename GetVertexPointMap::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, tmesh)); @@ -940,13 +935,13 @@ face_aspect_ratio(typename boost::graph_traits::face_descriptor f, * * @return the centroid of the domain bounded by `tmesh`. */ -template +template #ifdef DOXYGEN_RUNNING Point_3 #else -typename GetGeomTraits::type::Point_3 +typename GetGeomTraits::type::Point_3 #endif -centroid(const TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np) +centroid(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np) { // See: http://www2.imperial.ac.uk/~rn/centroid.pdf @@ -956,11 +951,11 @@ centroid(const TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np) using parameters::choose_parameter; using parameters::get_parameter; - typedef typename GetVertexPointMap::const_type Vpm; + typedef typename GetVertexPointMap::const_type Vpm; Vpm vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, tmesh)); - typedef typename GetGeomTraits::type Kernel; + typedef typename GetGeomTraits::type Kernel; typedef typename Kernel::Point_3 Point_3; typedef typename Kernel::Vector_3 Vector_3; typedef typename Kernel::Construct_translated_point_3 Construct_translated_point_3; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h index 812373cb7c8..2a1e1019878 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h index 768019c0718..e38b6e925f8 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/random_perturbation.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/random_perturbation.h index 556998e2f9a..defc8d3de61 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/random_perturbation.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/random_perturbation.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h index 5c4742f6b60..d2dd629bd6c 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h index b011b2d61b6..0d41ff42435 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h @@ -19,7 +19,7 @@ #include -#include +#include #include #ifdef CGAL_PMP_REMESHING_VERBOSE diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h index ccad1bf4d50..6da0d04006a 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h @@ -920,12 +920,12 @@ bool remove_almost_degenerate_faces(const FaceRange& face_range, CGAL::parameters::all_default()); } -template +template bool remove_almost_degenerate_faces(TriangleMesh& tmesh, const double cap_threshold, const double needle_threshold, const double collapse_length_threshold, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { return remove_almost_degenerate_faces(faces(tmesh), tmesh, cap_threshold, needle_threshold, collapse_length_threshold, np); @@ -1728,18 +1728,18 @@ bool remove_degenerate_edges(const EdgeRange& edge_range, return all_removed; } -template +template bool remove_degenerate_edges(const EdgeRange& edge_range, TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { std::set::face_descriptor> face_set; return remove_degenerate_edges(edge_range, tmesh, face_set, np); } -template +template bool remove_degenerate_edges(TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { std::set::face_descriptor> face_set; return remove_degenerate_edges(edges(tmesh), tmesh, face_set, np); @@ -2624,9 +2624,9 @@ bool remove_degenerate_faces(const FaceRange& face_range, return remove_degenerate_faces(face_range, tmesh, CGAL::parameters::all_default()); } -template +template bool remove_degenerate_faces(TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { return remove_degenerate_faces(faces(tmesh), tmesh, np); } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h index 6af8c8cbdbc..1bd4c9e445e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_self_intersections.h index e6ad38f591f..26736869a67 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_self_intersections.h @@ -2110,8 +2110,8 @@ bool remove_self_intersections(const FaceRange& face_range, TriangleMesh& tmesh) return remove_self_intersections(face_range, tmesh, parameters::all_default()); } -template -bool remove_self_intersections(TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np) +template +bool remove_self_intersections(TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np) { return remove_self_intersections(faces(tmesh), tmesh, np); } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index 606e13e9750..9f40683a092 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include @@ -50,11 +50,6 @@ #include #include -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - namespace CGAL { namespace Polygon_mesh_processing { namespace internal { @@ -539,11 +534,11 @@ self_intersections(const FaceRange& face_range, template + class CGAL_BGL_NP_TEMPLATE_PARAMETERS> FacePairOutputIterator self_intersections(const TriangleMesh& tmesh, FacePairOutputIterator out, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { return self_intersections(faces(tmesh), tmesh, out, np); } @@ -660,9 +655,9 @@ bool does_self_intersect(const FaceRange& face_range, */ template + class CGAL_BGL_NP_TEMPLATE_PARAMETERS> bool does_self_intersect(const TriangleMesh& tmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { return does_self_intersect(faces(tmesh), tmesh, np); } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/shape_predicates.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/shape_predicates.h index fb05b41b819..33b70706c12 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/shape_predicates.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/shape_predicates.h @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_mesh.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_mesh.h index c054e7feda8..842257462f1 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_mesh.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_mesh.h @@ -25,11 +25,6 @@ #include -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - namespace CGAL { namespace Polygon_mesh_processing { @@ -335,8 +330,8 @@ void smooth_mesh(const FaceRange& face_range, TriangleMesh& tmesh) smooth_mesh(face_range, tmesh, parameters::all_default()); } -template -void smooth_mesh(TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np) +template +void smooth_mesh(TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np) { smooth_mesh(faces(tmesh), tmesh, np); } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h index 9f0bb5771a8..5aebfe9d66a 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h @@ -30,11 +30,6 @@ #include #endif -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - namespace CGAL { namespace Polygon_mesh_processing { @@ -210,10 +205,10 @@ void smooth_shape(const FaceRange& faces, smooth_shape(faces, tmesh, time, parameters::all_default()); } -template +template void smooth_shape(TriangleMesh& tmesh, const double time, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { smooth_shape(faces(tmesh), tmesh, time, np); } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/stitch_borders.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/stitch_borders.h index e936df1bff9..61da01c049b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/stitch_borders.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/stitch_borders.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -44,11 +44,6 @@ #include #include -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - #ifdef CGAL_PMP_STITCHING_DEBUG_PP # ifndef CGAL_PMP_STITCHING_DEBUG # define CGAL_PMP_STITCHING_DEBUG @@ -366,20 +361,20 @@ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> OutputIterator collect_duplicated_stitchable_boundary_edges(const HalfedgeRange& halfedge_range, PolygonMesh& pmesh, const HalfedgeKeeper& hd_kpr, const bool per_cc, OutputIterator out, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { using parameters::choose_parameter; using parameters::get_parameter; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; - typedef typename GetVertexPointMap::const_type VPM; + typedef typename GetVertexPointMap::const_type VPM; VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(vertex_point, pmesh)); @@ -1026,11 +1021,11 @@ std::size_t zip_boundary_cycle(typename boost::graph_traits::halfed /// High-level functions -template +template std::size_t stitch_boundary_cycle(const typename boost::graph_traits::halfedge_descriptor h, PolygonMesh& pmesh, CycleRepMaintainer& cycle_reps_maintainer, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename std::pair halfedges_pair; @@ -1042,12 +1037,12 @@ std::size_t stitch_boundary_cycle(const typename boost::graph_traits::const_type VPM; + typedef typename GetVertexPointMap::const_type VPM; VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(vertex_point, pmesh)); typedef typename internal_np::Lookup_named_param_def >::type Halfedge_keeper; const Halfedge_keeper hd_kpr = choose_parameter(get_parameter(np, internal_np::halfedges_keeper), Default_halfedges_keeper()); @@ -1119,10 +1114,10 @@ std::size_t stitch_boundary_cycle(const typename boost::graph_traits +template std::size_t stitch_boundary_cycle(const typename boost::graph_traits::halfedge_descriptor h, PolygonMesh& pmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { internal::Dummy_cycle_rep_maintainer dummy_maintainer(pmesh); return internal::stitch_boundary_cycle(h, pmesh, dummy_maintainer, np); @@ -1138,11 +1133,11 @@ std::size_t stitch_boundary_cycle(const typename boost::graph_traits + typename CycleRepMaintainer, typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> std::size_t stitch_boundary_cycles(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, CycleRepMaintainer& cycle_reps_maintainer, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1187,10 +1182,10 @@ std::size_t stitch_boundary_cycles(const BorderHalfedgeRange& boundary_cycle_rep /// \sa `stitch_boundary_cycle()` /// \sa `stitch_borders()` /// -template +template std::size_t stitch_boundary_cycles(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { // If this API is called, we are not from stitch_borders() (otherwise there would be a maintainer) // so there is only one pass and we don't carea bout maintaining the cycle subset @@ -1201,9 +1196,9 @@ std::size_t stitch_boundary_cycles(const BorderHalfedgeRange& boundary_cycle_rep ///\cond SKIP_IN_MANUAL // convenience overloads -template +template std::size_t stitch_boundary_cycles(PolygonMesh& pmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1231,10 +1226,10 @@ std::size_t stitch_boundary_cycles(PolygonMesh& pmesh) // There is thus nothing interesting to pass via named parameters and this overload is not documented. template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> std::size_t stitch_borders(PolygonMesh& pmesh, const HalfedgePairsRange& hedge_pairs_to_stitch, - const CGAL_PMP_NP_CLASS& np, + const CGAL_BGL_NP_CLASS& np, typename boost::enable_if< typename boost::has_range_iterator >::type* = 0) @@ -1242,7 +1237,7 @@ std::size_t stitch_borders(PolygonMesh& pmesh, using parameters::choose_parameter; using parameters::get_parameter; - typedef typename GetVertexPointMap::const_type VPM; + typedef typename GetVertexPointMap::const_type VPM; VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(vertex_point, pmesh)); @@ -1291,11 +1286,11 @@ namespace internal { template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, CycleRepMaintainer& cycle_maintainer, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1305,12 +1300,12 @@ std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representat if(boundary_cycle_representatives.size() == 0) return 0; - typedef typename GetVertexPointMap::const_type VPM; + typedef typename GetVertexPointMap::const_type VPM; VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(vertex_point, pmesh)); typedef typename internal_np::Lookup_named_param_def >::type Halfedge_keeper; const Halfedge_keeper hd_kpr = choose_parameter(get_parameter(np, internal_np::halfedges_keeper), Default_halfedges_keeper()); @@ -1403,10 +1398,10 @@ std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representat /// \sa `stitch_boundary_cycle()` /// \sa `stitch_boundary_cycles()` /// -template +template std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, - const CGAL_PMP_NP_CLASS& np + const CGAL_BGL_NP_CLASS& np #ifndef DOXYGEN_RUNNING , typename boost::enable_if< typename boost::has_range_iterator @@ -1433,9 +1428,9 @@ std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representat return stitch_borders(boundary_cycle_representatives, pmesh, cycle_reps_maintainer, parameters::all_default()); } -template +template std::size_t stitch_borders(PolygonMesh& pmesh, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/transform.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/transform.h index 01cf935b924..1dd96bfd21c 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/transform.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/transform.h @@ -13,7 +13,7 @@ #define CGAL_POLYGON_MESH_PROCESSING_TRANSFORM_H #include -#include +#include #include namespace CGAL{ diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index a2cc56ae520..da6a388fa9f 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h index 2a7bde13293..9fd14f02c87 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -31,11 +31,6 @@ #include -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - namespace CGAL { namespace Polygon_mesh_processing { @@ -634,11 +629,11 @@ bool use_dt3 = */ template + typename CGAL_BGL_NP_TEMPLATE_PARAMETERS> OutputIterator triangulate_hole_polyline(const PointRange& points, OutputIterator out, - const CGAL_PMP_NP_CLASS& np) + const CGAL_BGL_NP_CLASS& np) { typedef typename std::iterator_traits< typename PointRange::iterator>::value_type Point; diff --git a/Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h b/Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h index c8d8b784513..ec560767978 100644 --- a/Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h +++ b/Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h @@ -88,11 +88,6 @@ #include #include -#ifdef DOXYGEN_RUNNING -#define CGAL_PMP_NP_TEMPLATE_PARAMETERS NamedParameters -#define CGAL_PMP_NP_CLASS NamedParameters -#endif - namespace CGAL { /** @@ -2249,14 +2244,14 @@ public: * the initial list of prisms. * \todo apply that to the soup versions */ - template + template bool - operator()(const TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np) const + operator()(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np) const { using parameters::choose_parameter; using parameters::get_parameter; - typename GetVertexPointMap::const_type + typename GetVertexPointMap::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, tmesh)); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp index 120c5347bf3..c062ae01a00 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp @@ -67,7 +67,7 @@ #include #include -#include +#include #include typedef Scene_surface_mesh_item Scene_facegraph_item; typedef Scene_facegraph_item::Face_graph FaceGraph; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp index c4a6207c968..f34b327bfe8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h b/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h index fc2ac29aeb3..547ebc4a500 100644 --- a/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h +++ b/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include //a material is composed of an material Id and a material name. diff --git a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Doxyfile.in b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Doxyfile.in index a0a33b4553f..59dccb4ff04 100644 --- a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Doxyfile.in +++ b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Doxyfile.in @@ -9,8 +9,3 @@ WARN_IF_UNDOCUMENTED = false EXAMPLE_PATH += ${CGAL_Tetrahedral_remeshing_EXAMPLE_DIR} EXCLUDE = ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/Tetrahedral_remeshing/internal - -#MACRO_EXPANSION = YES -#EXPAND_ONLY_PREDEF = YES -#EXPAND_AS_DEFINED = CGAL_PMP_NP_TEMPLATE_PARAMETERS \ -# CGAL_PMP_NP_CLASS