From 10b0af309216ee0828bd29fea081a658e750fb80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 13 Jan 2022 14:43:34 +0100 Subject: [PATCH] rename macro since Named_function_parameter is part of STL_Extension --- .../CGAL/boost/graph/Face_filtered_graph.h | 16 ++-- BGL/include/CGAL/boost/graph/IO/GOCAD.h | 32 +++---- BGL/include/CGAL/boost/graph/IO/INP.h | 10 +-- BGL/include/CGAL/boost/graph/IO/OBJ.h | 18 ++-- BGL/include/CGAL/boost/graph/IO/OFF.h | 42 ++++----- BGL/include/CGAL/boost/graph/IO/PLY.h | 42 ++++----- BGL/include/CGAL/boost/graph/IO/STL.h | 22 ++--- BGL/include/CGAL/boost/graph/IO/VTK.h | 16 ++-- BGL/include/CGAL/boost/graph/IO/WRL.h | 12 +-- .../doc/resources/1.8.13/BaseDoxyfile.in | 12 +-- .../doc/resources/1.8.14/BaseDoxyfile.in | 12 +-- .../doc/resources/1.8.20/BaseDoxyfile.in | 12 +-- .../doc/resources/1.8.4/BaseDoxyfile.in | 12 +-- .../doc/resources/1.9.3/BaseDoxyfile.in | 12 +-- Point_set_3/include/CGAL/Point_set_3/IO.h | 8 +- Point_set_3/include/CGAL/Point_set_3/IO/OFF.h | 8 +- Point_set_3/include/CGAL/Point_set_3/IO/PLY.h | 24 +++--- Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h | 8 +- .../include/CGAL/IO/read_las_points.h | 30 +++---- .../include/CGAL/IO/read_off_points.h | 26 +++--- .../include/CGAL/IO/read_ply_points.h | 26 +++--- .../include/CGAL/IO/read_xyz_points.h | 26 +++--- .../include/CGAL/IO/write_las_points.h | 14 +-- .../include/CGAL/IO/write_off_points.h | 20 ++--- .../include/CGAL/IO/write_ply_points.h | 14 +-- .../include/CGAL/IO/write_points.h | 4 +- .../include/CGAL/IO/write_xyz_points.h | 18 ++-- .../include/CGAL/compute_average_spacing.h | 8 +- .../connected_components.h | 26 +++--- .../CGAL/Polygon_mesh_processing/extrude.h | 28 +++--- .../internal/Snapping/snap.h | 8 +- .../internal/Snapping/snap_vertices.h | 10 +-- .../Polygon_mesh_processing/intersection.h | 18 ++-- .../CGAL/Polygon_mesh_processing/measure.h | 70 +++++++-------- .../repair_degeneracies.h | 16 ++-- .../repair_self_intersections.h | 4 +- .../self_intersections.h | 8 +- .../shape_predicates.h | 16 ++-- .../Polygon_mesh_processing/smooth_mesh.h | 4 +- .../Polygon_mesh_processing/smooth_shape.h | 4 +- .../Polygon_mesh_processing/stitch_borders.h | 52 +++++------ .../triangulate_hole.h | 4 +- .../include/CGAL/Polyhedral_envelope.h | 6 +- .../include/CGAL/IO/Polyhedron_OFF_iostream.h | 34 ++++---- .../include/CGAL/Named_function_parameters.h | 14 +-- Stream_support/include/CGAL/IO/GOCAD.h | 26 +++--- Stream_support/include/CGAL/IO/OBJ.h | 16 ++-- Stream_support/include/CGAL/IO/OFF.h | 16 ++-- Stream_support/include/CGAL/IO/PLY.h | 16 ++-- Stream_support/include/CGAL/IO/STL.h | 18 ++-- Stream_support/include/CGAL/IO/VTK.h | 8 +- .../include/CGAL/IO/polygon_soup_io.h | 8 +- .../include/CGAL/Surface_mesh/IO/OFF.h | 86 +++++++++---------- .../include/CGAL/Surface_mesh/IO/PLY.h | 8 +- 54 files changed, 514 insertions(+), 514 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h index f0bdc4fb9c1..794329af4f2 100644 --- a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h +++ b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h @@ -147,9 +147,9 @@ struct Face_filtered_graph * \cgalParamNEnd * \cgalNamedParamsEnd */ - template + template Face_filtered_graph(const Graph& graph, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) : _graph(const_cast(graph)) , fimap(CGAL::get_initialized_face_index_map(graph, np)) , vimap(CGAL::get_initialized_vertex_index_map(graph, np)) @@ -208,11 +208,11 @@ struct Face_filtered_graph * \cgalParamNEnd * \cgalNamedParamsEnd */ - template + template Face_filtered_graph(const Graph& graph, const FacePatchIndexRange& selected_face_patch_indices, FacePatchIndexMap face_patch_index_map, - const CGAL_BGL_NP_CLASS& np + const CGAL_NP_CLASS& np #ifndef DOXYGEN_RUNNING , typename boost::enable_if< typename boost::has_range_const_iterator::type @@ -290,11 +290,11 @@ struct Face_filtered_graph * \cgalParamNEnd * \cgalNamedParamsEnd */ - template + template Face_filtered_graph(const Graph& graph, typename boost::property_traits::value_type selected_face_patch_index, FacePatchIndexMap face_patch_index_map, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) : _graph(const_cast(graph)), fimap(CGAL::get_initialized_face_index_map(graph, np)), vimap(CGAL::get_initialized_vertex_index_map(graph, np)), @@ -360,10 +360,10 @@ struct Face_filtered_graph * \cgalParamNEnd * \cgalNamedParamsEnd */ - template + template Face_filtered_graph(const Graph& graph, const FaceRange& selected_faces, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) : _graph(const_cast(graph)), fimap(CGAL::get_initialized_face_index_map(graph, np)), vimap(CGAL::get_initialized_vertex_index_map(graph, np)), diff --git a/BGL/include/CGAL/boost/graph/IO/GOCAD.h b/BGL/include/CGAL/boost/graph/IO/GOCAD.h index 2e7af0193e5..b273394ae84 100644 --- a/BGL/include/CGAL/boost/graph/IO/GOCAD.h +++ b/BGL/include/CGAL/boost/graph/IO/GOCAD.h @@ -108,17 +108,17 @@ public: /// \returns `true` if reading was successful and the resulting mesh is valid, `false` otherwise. /// template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_GOCAD(std::istream& is, std::pair& name_and_color, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif ) { - typedef typename CGAL::GetVertexPointMap::type VPM; + typedef typename CGAL::GetVertexPointMap::type VPM; typedef typename boost::property_traits::value_type Point; internal::GOCAD_builder builder(is); @@ -133,8 +133,8 @@ bool read_GOCAD(std::istream& is, /// \cond SKIP_IN_MANUAL -template -bool read_GOCAD(std::istream& is, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool read_GOCAD(std::istream& is, Graph& g, const CGAL_NP_CLASS& np = parameters::default_values(), typename boost::disable_if >::type* = nullptr) { std::pair dummy; @@ -182,11 +182,11 @@ bool read_GOCAD(std::istream& is, Graph& g, const CGAL_BGL_NP_CLASS& np = parame /// \returns `true` if reading was successful and the resulting mesh is valid, `false` otherwise. /// template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_GOCAD(const std::string& fname, std::pair& name_and_color, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -199,8 +199,8 @@ bool read_GOCAD(const std::string& fname, /// \cond SKIP_IN_MANUAL -template -bool read_GOCAD(const std::string& fname, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool read_GOCAD(const std::string& fname, Graph& g, const CGAL_NP_CLASS& np = parameters::default_values(), typename boost::disable_if >::type* = nullptr) { std::pair dummy; @@ -245,11 +245,11 @@ bool read_GOCAD(const std::string& fname, Graph& g, const CGAL_BGL_NP_CLASS& np /// \returns `true` if writing was successful, `false` otherwise. /// template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_GOCAD(std::ostream& os, const char* name, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -263,7 +263,7 @@ bool write_GOCAD(std::ostream& os, using parameters::choose_parameter; using parameters::get_parameter; - typename CGAL::GetVertexPointMap::const_type + typename CGAL::GetVertexPointMap::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, g)); @@ -342,10 +342,10 @@ bool write_GOCAD(std::ostream& os, /// \returns `true` if writing was successful, `false` otherwise. /// template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_GOCAD(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -387,10 +387,10 @@ bool write_GOCAD(std::ostream& os, /// \sa Overloads of this function for specific models of the concept `FaceGraph`. /// template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_GOCAD(const std::string& fname, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif diff --git a/BGL/include/CGAL/boost/graph/IO/INP.h b/BGL/include/CGAL/boost/graph/IO/INP.h index 229b696f830..eec6986e16f 100644 --- a/BGL/include/CGAL/boost/graph/IO/INP.h +++ b/BGL/include/CGAL/boost/graph/IO/INP.h @@ -27,18 +27,18 @@ namespace IO { /// \cond SKIP_IN_MANUAL -template +template bool write_INP(std::ostream& os, const std::string& name, const std::string& type, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::face_descriptor face_descriptor; typedef typename boost::graph_traits::vertices_size_type vertices_size_type; - typedef typename CGAL::GetVertexPointMap::const_type VPM; + typedef typename CGAL::GetVertexPointMap::const_type VPM; typedef typename boost::property_traits::reference Point_ref; using parameters::choose_parameter; @@ -76,11 +76,11 @@ bool write_INP(std::ostream& os, return os.good(); } -template +template bool write_INP(const std::string& fname, const std::string& type, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() ) + const CGAL_NP_CLASS& np = parameters::default_values() ) { std::ofstream os(fname); return write_INP(os, fname, type, g, np); diff --git a/BGL/include/CGAL/boost/graph/IO/OBJ.h b/BGL/include/CGAL/boost/graph/IO/OBJ.h index 85e9197be34..16e779bf9ba 100644 --- a/BGL/include/CGAL/boost/graph/IO/OBJ.h +++ b/BGL/include/CGAL/boost/graph/IO/OBJ.h @@ -104,16 +104,16 @@ public: \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_OBJ(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif ) { - typedef typename CGAL::GetVertexPointMap::type VPM; + typedef typename CGAL::GetVertexPointMap::type VPM; typedef typename boost::property_traits::value_type Point; internal::OBJ_builder builder(is); @@ -160,10 +160,10 @@ bool read_OBJ(std::istream& is, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_OBJ(const std::string& fname, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -212,10 +212,10 @@ bool read_OBJ(const std::string& fname, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_OBJ(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -258,10 +258,10 @@ bool write_OBJ(std::ostream& os, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_OBJ(const std::string& fname, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif diff --git a/BGL/include/CGAL/boost/graph/IO/OFF.h b/BGL/include/CGAL/boost/graph/IO/OFF.h index b1582c21dca..0d1b242be5e 100644 --- a/BGL/include/CGAL/boost/graph/IO/OFF.h +++ b/BGL/include/CGAL/boost/graph/IO/OFF.h @@ -64,12 +64,12 @@ public: // Because some packages can provide overloads with the same signature to automatically initialize // property maps (see Surface_mesh/IO/ for example) -template +template bool read_OFF_BGL(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { - typedef typename CGAL::GetVertexPointMap::type VPM; + typedef typename CGAL::GetVertexPointMap::type VPM; typedef typename boost::property_traits::value_type Point; internal::OFF_builder builder(is); @@ -150,10 +150,10 @@ bool read_OFF_BGL(std::istream& is, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_OFF(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -234,10 +234,10 @@ bool read_OFF(std::istream& is, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_OFF(const std::string& fname, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -256,8 +256,8 @@ bool read_OFF(const std::string& fname, \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::read_OFF()` should be used instead. */ -template -CGAL_DEPRECATED bool read_off(std::istream& is, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool read_off(std::istream& is, Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(is, g, np); } @@ -267,8 +267,8 @@ CGAL_DEPRECATED bool read_off(std::istream& is, Graph& g, const CGAL_BGL_NP_CLAS \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::read_OFF()` should be used instead. */ -template -CGAL_DEPRECATED bool read_off(const char* fname, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool read_off(const char* fname, Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(fname, g, np); } @@ -287,10 +287,10 @@ CGAL_DEPRECATED bool read_off(const std::string& fname, Graph& g) namespace IO { namespace internal { -template +template bool write_OFF_BGL(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { internal::Generic_facegraph_printer printer(os); return printer(g, np); @@ -360,10 +360,10 @@ bool write_OFF_BGL(std::ostream& os, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_OFF(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -434,10 +434,10 @@ bool write_OFF(std::ostream& os, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_OFF(const std::string& fname, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -462,8 +462,8 @@ bool write_OFF(const std::string& fname, \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::write_OFF()` should be used instead. */ -template -CGAL_DEPRECATED bool write_off(std::ostream& os, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool write_off(std::ostream& os, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_OFF(os, g, np); } @@ -473,8 +473,8 @@ CGAL_DEPRECATED bool write_off(std::ostream& os, const Graph& g, const CGAL_BGL_ \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::write_OFF()` should be used instead. */ -template -CGAL_DEPRECATED bool write_off(const char* fname, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool write_off(const char* fname, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_OFF(fname, g, np); } diff --git a/BGL/include/CGAL/boost/graph/IO/PLY.h b/BGL/include/CGAL/boost/graph/IO/PLY.h index 05633ae85f7..df8345258fc 100644 --- a/BGL/include/CGAL/boost/graph/IO/PLY.h +++ b/BGL/include/CGAL/boost/graph/IO/PLY.h @@ -58,12 +58,12 @@ public: } }; -template +template bool read_PLY_BGL(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { - typedef typename CGAL::GetVertexPointMap::type VPM; + typedef typename CGAL::GetVertexPointMap::type VPM; typedef typename boost::property_traits::value_type Point; internal::PLY_builder builder(is); @@ -131,10 +131,10 @@ bool read_PLY_BGL(std::istream& is, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_PLY(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -206,10 +206,10 @@ bool read_PLY(std::istream& is, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_PLY(const std::string& fname, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -292,11 +292,11 @@ bool read_PLY(const std::string& fname, \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_PLY(std::ostream& os, const Graph& g, const std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -306,17 +306,17 @@ bool write_PLY(std::ostream& os, typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits::face_descriptor face_descriptor; - typedef typename CGAL::GetInitializedVertexIndexMap::const_type VIMap; - typedef typename GetVertexPointMap::const_type Vpm; + typedef typename CGAL::GetInitializedVertexIndexMap::const_type VIMap; + typedef typename GetVertexPointMap::const_type Vpm; typedef typename boost::property_traits::value_type Point_3; typedef CGAL::IO::Color Color; typedef typename internal_np::Lookup_named_param_def< internal_np::vertex_color_map_t, - CGAL_BGL_NP_CLASS, + CGAL_NP_CLASS, Constant_property_map >::type VCM; typedef typename internal_np::Lookup_named_param_def< internal_np::face_color_map_t, - CGAL_BGL_NP_CLASS, + CGAL_NP_CLASS, Constant_property_map >::type FCM; using parameters::choose_parameter; @@ -326,8 +326,8 @@ bool write_PLY(std::ostream& os, VCM vcm = choose_parameter(get_parameter(np, internal_np::vertex_color_map), VCM()); FCM fcm = choose_parameter(get_parameter(np, internal_np::face_color_map), FCM()); - bool has_vcolor = !is_default_parameter(); - bool has_fcolor = !is_default_parameter(); + bool has_vcolor = !is_default_parameter(); + bool has_fcolor = !is_default_parameter(); VIMap vim = CGAL::get_initialized_vertex_index_map(g, np); Vpm vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(boost::vertex_point, g)); @@ -419,8 +419,8 @@ bool write_PLY(std::ostream& os, /// \cond SKIP_IN_MANUAL -template -bool write_PLY(std::ostream& os, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool write_PLY(std::ostream& os, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values(), typename boost::disable_if >::type* = nullptr) { return write_PLY(os, g, std::string(), np); @@ -488,11 +488,11 @@ bool write_PLY(std::ostream& os, const Graph& g, const CGAL_BGL_NP_CLASS& np = p \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_PLY(const std::string& fname, const Graph& g, const std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -516,8 +516,8 @@ bool write_PLY(const std::string& fname, /// \cond SKIP_IN_MANUAL -template -bool write_PLY(const std::string& fname, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool write_PLY(const std::string& fname, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values(), typename boost::disable_if >::type* = nullptr) { return write_PLY(fname, g, std::string(), np); diff --git a/BGL/include/CGAL/boost/graph/IO/STL.h b/BGL/include/CGAL/boost/graph/IO/STL.h index 2d5f849b811..d2090bfa052 100644 --- a/BGL/include/CGAL/boost/graph/IO/STL.h +++ b/BGL/include/CGAL/boost/graph/IO/STL.h @@ -98,12 +98,12 @@ public: \sa Overloads of this function for specific models of the concept `FaceGraph`. */ -template +template bool read_STL(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { - typedef typename CGAL::GetVertexPointMap::type VPM; + typedef typename CGAL::GetVertexPointMap::type VPM; typedef typename boost::property_traits::value_type Point; if(!is.good()) return false; @@ -155,10 +155,10 @@ bool read_STL(std::istream& is, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ -template +template bool read_STL(const std::string& fname, Graph& g, const - CGAL_BGL_NP_CLASS& np = parameters::default_values()) + CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -177,7 +177,7 @@ bool read_STL(const std::string& fname, std::ifstream is(fname); CGAL::IO::set_mode(is, CGAL::IO::ASCII); - typedef typename CGAL::GetVertexPointMap::type VPM; + typedef typename CGAL::GetVertexPointMap::type VPM; VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_property_map(CGAL::vertex_point, g)); bool v = choose_parameter(get_parameter(np, internal_np::verbose), @@ -234,15 +234,15 @@ bool read_STL(std::istream& is, Graph& g) { return read_STL(is, g, parameters::d \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_STL(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits::face_descriptor face_descriptor; - typedef typename CGAL::GetVertexPointMap::const_type VPM; + typedef typename CGAL::GetVertexPointMap::const_type VPM; typedef typename boost::property_traits::reference Point_ref; typedef typename boost::property_traits::value_type Point; typedef typename Kernel_traits::Kernel::Vector_3 Vector; @@ -351,8 +351,8 @@ bool write_STL(std::ostream& os, \sa Overloads of this function for specific models of the concept `FaceGraph`. */ -template -bool write_STL(const std::string& fname, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_STL(const std::string& fname, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { const bool binary = CGAL::parameters::choose_parameter(CGAL::parameters::get_parameter(np, internal_np::use_binary_mode), true); if(binary) diff --git a/BGL/include/CGAL/boost/graph/IO/VTK.h b/BGL/include/CGAL/boost/graph/IO/VTK.h index fd4aa657afa..931c744765e 100644 --- a/BGL/include/CGAL/boost/graph/IO/VTK.h +++ b/BGL/include/CGAL/boost/graph/IO/VTK.h @@ -140,10 +140,10 @@ bool vtkPointSet_to_polygon_mesh(vtkPointSet* poly_data, * \returns `true` if reading was successful, `false` otherwise. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_VTP(const std::string& fname, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { std::ifstream test(fname); if(!test.good()) @@ -412,10 +412,10 @@ void write_polys_points(std::ostream& os, * * \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_VTP(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; @@ -511,8 +511,8 @@ bool write_VTP(std::ostream& os, * * \returns `true` if writing was successful, `false` otherwise. */ -template -bool write_VTP(const std::string& fname, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_VTP(const std::string& fname, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { const bool binary = CGAL::parameters::choose_parameter(CGAL::parameters::get_parameter(np, internal_np::use_binary_mode), true); std::ofstream os; @@ -536,8 +536,8 @@ bool write_VTP(const std::string& fname, const Graph& g, const CGAL_BGL_NP_CLASS \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::write_VTP()` should be used instead. */ -template -CGAL_DEPRECATED bool write_vtp(std::ostream& os, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool write_vtp(std::ostream& os, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_VTP(os, g, np); } diff --git a/BGL/include/CGAL/boost/graph/IO/WRL.h b/BGL/include/CGAL/boost/graph/IO/WRL.h index f79e8b05d19..b92429a193b 100644 --- a/BGL/include/CGAL/boost/graph/IO/WRL.h +++ b/BGL/include/CGAL/boost/graph/IO/WRL.h @@ -61,10 +61,10 @@ namespace IO { \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_WRL(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { CGAL::VRML_2_ostream vos(os); internal::Generic_facegraph_printer printer(vos); @@ -102,8 +102,8 @@ bool write_WRL(std::ostream& os, \returns `true` if writing was successful, `false` otherwise. */ -template -bool write_WRL(const std::string& fname, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_WRL(const std::string& fname, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { std::ofstream os(fname); return write_WRL(os, g, np); @@ -118,8 +118,8 @@ bool write_WRL(const std::string& fname, const Graph& g, const CGAL_BGL_NP_CLASS \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::write_WRL()` should be used instead. */ -template -CGAL_DEPRECATED bool write_wrl(std::ostream& os, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool write_wrl(std::ostream& os, const Graph& g, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_WRL(os, g, np); } diff --git a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in index ac894c38477..03b6c67ef41 100644 --- a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in @@ -2173,12 +2173,12 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = DOXYGEN_RUNNING \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ - "CGAL_BGL_NP_CLASS=NamedParameters" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_1=NamedParameters1" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_2=NamedParameters2" \ + "CGAL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ + "CGAL_NP_CLASS=NamedParameters" \ + "CGAL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_1=NamedParameters1" \ + "CGAL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_2=NamedParameters2" \ CGAL_DEPRECATED # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in index 8c5e85797fc..491ceed309c 100644 --- a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in @@ -2161,12 +2161,12 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = DOXYGEN_RUNNING \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ - "CGAL_BGL_NP_CLASS=NamedParameters" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_1=NamedParameters1" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_2=NamedParameters2" \ + "CGAL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ + "CGAL_NP_CLASS=NamedParameters" \ + "CGAL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_1=NamedParameters1" \ + "CGAL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_2=NamedParameters2" \ CGAL_DEPRECATED # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/Documentation/doc/resources/1.8.20/BaseDoxyfile.in b/Documentation/doc/resources/1.8.20/BaseDoxyfile.in index d450a6a5aab..38d6df6f400 100644 --- a/Documentation/doc/resources/1.8.20/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.8.20/BaseDoxyfile.in @@ -2244,12 +2244,12 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = DOXYGEN_RUNNING \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ - "CGAL_BGL_NP_CLASS=NamedParameters" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_1=NamedParameters1" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_2=NamedParameters2" \ + "CGAL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ + "CGAL_NP_CLASS=NamedParameters" \ + "CGAL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_1=NamedParameters1" \ + "CGAL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_2=NamedParameters2" \ CGAL_DEPRECATED # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this diff --git a/Documentation/doc/resources/1.8.4/BaseDoxyfile.in b/Documentation/doc/resources/1.8.4/BaseDoxyfile.in index 477b2e17d15..9b33b9e51a1 100644 --- a/Documentation/doc/resources/1.8.4/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.8.4/BaseDoxyfile.in @@ -1761,12 +1761,12 @@ INCLUDE_FILE_PATTERNS = # instead of the = operator. PREDEFINED = DOXYGEN_RUNNING \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ - "CGAL_BGL_NP_CLASS=NamedParameters" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_1=NamedParameters1" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_2=NamedParameters2" \ + "CGAL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ + "CGAL_NP_CLASS=NamedParameters" \ + "CGAL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_1=NamedParameters1" \ + "CGAL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_2=NamedParameters2" \ CGAL_DEPRECATED # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then diff --git a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in index 80061d70751..a12bfce4648 100644 --- a/Documentation/doc/resources/1.9.3/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.9.3/BaseDoxyfile.in @@ -2244,12 +2244,12 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = DOXYGEN_RUNNING \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ - "CGAL_BGL_NP_CLASS=NamedParameters" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_1=NamedParameters1" \ - "CGAL_BGL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ - "CGAL_BGL_NP_CLASS_2=NamedParameters2" \ + "CGAL_NP_TEMPLATE_PARAMETERS=NamedParameters = CGAL::parameters::Default_named_parameters" \ + "CGAL_NP_CLASS=NamedParameters" \ + "CGAL_NP_TEMPLATE_PARAMETERS_1=NamedParameters1 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_1=NamedParameters1" \ + "CGAL_NP_TEMPLATE_PARAMETERS_2=NamedParameters2 = CGAL::parameters::Default_named_parameter" \ + "CGAL_NP_CLASS_2=NamedParameters2" \ CGAL_DEPRECATED diff --git a/Point_set_3/include/CGAL/Point_set_3/IO.h b/Point_set_3/include/CGAL/Point_set_3/IO.h index 6079a73b085..2e680a744f8 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO.h @@ -118,10 +118,10 @@ namespace IO { \return `true` if the reading was successful, `false` otherwise. */ -template +template bool read_point_set(const std::string& fname, CGAL::Point_set_3& ps, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { const std::string ext = internal::get_file_extension(fname); @@ -211,10 +211,10 @@ namespace IO { \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_point_set(const std::string& fname, CGAL::Point_set_3& ps, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { const std::string ext = internal::get_file_extension(fname); diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h b/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h index 07a7ad3d8d8..5bd35941615 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/OFF.h @@ -140,10 +140,10 @@ namespace IO { \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_OFF(std::ostream& os, const CGAL::Point_set_3& point_set, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { if(point_set.has_normal_map()) return Point_set_processing_3::internal::write_OFF_PSP(os, point_set, @@ -179,8 +179,8 @@ bool write_OFF(std::ostream& os, \return `true` if the writing was successful, `false` otherwise. */ -template -bool write_OFF(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_OFF(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_NP_CLASS& np = parameters::default_values()) { std::ofstream os(fname); return write_OFF(os, point_set, np); diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h index 0c451d95d34..725d15ff120 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/PLY.h @@ -333,11 +333,11 @@ bool read_PLY(std::istream& is, CGAL::Point_set_3& point_set) \return `true` if the reading was successful, `false` otherwise. */ -template +template bool read_PLY(const std::string& fname, CGAL::Point_set_3& point_set, std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { const bool binary = CGAL::parameters::choose_parameter(CGAL::parameters::get_parameter(np, internal_np::use_binary_mode), true); if(binary) @@ -355,8 +355,8 @@ bool read_PLY(const std::string& fname, } /// \cond SKIP_IN_MANUAL -template -bool read_PLY(const std::string& fname, CGAL::Point_set_3& point_set, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool read_PLY(const std::string& fname, CGAL::Point_set_3& point_set, const CGAL_NP_CLASS& np = parameters::default_values()) { std::string unused_comments; return read_PLY(fname, point_set, unused_comments, np); @@ -446,11 +446,11 @@ namespace IO { \return `true` if the reading was successful, `false` otherwise. */ -template +template bool write_PLY(std::ostream& os, const CGAL::Point_set_3& point_set, const std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef CGAL::Point_set_3 Point_set; typedef typename Point_set::Index Index; @@ -663,8 +663,8 @@ bool write_PLY(std::ostream& os, /// \cond SKIP_IN_MANUAL -template -bool write_PLY(std::ostream& os, const CGAL::Point_set_3& point_set, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_PLY(std::ostream& os, const CGAL::Point_set_3& point_set, const CGAL_NP_CLASS& np = parameters::default_values()) { return write_PLY(os, point_set, std::string(), np); } @@ -709,11 +709,11 @@ bool write_PLY(std::ostream& os, const CGAL::Point_set_3& point_s \return `true` if the reading was successful, `false` otherwise. */ -template +template bool write_PLY(const std::string& fname, const CGAL::Point_set_3& point_set, const std::string& comments, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { const bool binary = CGAL::parameters::choose_parameter(CGAL::parameters::get_parameter(np, internal_np::use_binary_mode), true); if(binary) @@ -732,8 +732,8 @@ bool write_PLY(const std::string& fname, /// \cond SKIP_IN_MANUAL -template -bool write_PLY(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_PLY(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_NP_CLASS& np = parameters::default_values()) { return write_PLY(fname, point_set, std::string(), np); } diff --git a/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h b/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h index d915feb7b4e..72c00bd528e 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO/XYZ.h @@ -138,10 +138,10 @@ namespace IO { \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_XYZ(std::ostream& os, const CGAL::Point_set_3& point_set, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { if(point_set.has_normal_map()) return Point_set_processing_3::internal::write_XYZ_PSP(os, point_set, @@ -176,8 +176,8 @@ bool write_XYZ(std::ostream& os, \return `true` if the writing was successful, `false` otherwise. */ -template -bool write_XYZ(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_XYZ(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_NP_CLASS& np = parameters::default_values()) { std::ofstream os(fname); return write_XYZ(os, point_set, np); diff --git a/Point_set_processing_3/include/CGAL/IO/read_las_points.h b/Point_set_processing_3/include/CGAL/IO/read_las_points.h index a503168c6df..beb35f44355 100644 --- a/Point_set_processing_3/include/CGAL/IO/read_las_points.h +++ b/Point_set_processing_3/include/CGAL/IO/read_las_points.h @@ -456,17 +456,17 @@ bool read_LAS_with_properties(std::istream& is, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_LAS(std::istream& is, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; typedef Point_set_processing_3::Fake_point_range PointRange; - typedef typename CGAL::GetPointMap::type PointMap; + typedef typename CGAL::GetPointMap::type PointMap; PointMap point_map = choose_parameter(get_parameter(np, internal_np::point_map)); return read_LAS_with_properties(is, output, make_las_point_reader(point_map)); @@ -474,8 +474,8 @@ bool read_LAS(std::istream& is, /// \cond SKIP_IN_MANUAL -template -bool read_LAS(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool read_LAS(std::istream& is, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { return read_LAS::type>(is, output, np); @@ -520,10 +520,10 @@ bool read_LAS(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_LAS(const std::string& filename, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { std::ifstream is(filename, std::ios::binary); CGAL::IO::set_mode(is, CGAL::IO::BINARY); @@ -532,8 +532,8 @@ bool read_LAS(const std::string& filename, /// \cond SKIP_IN_MANUAL -template -bool read_LAS(const std::string& fname, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool read_LAS(const std::string& fname, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values()) { std::ifstream is(fname, std::ios::binary); CGAL::IO::set_mode(is, CGAL::IO::BINARY); @@ -610,16 +610,16 @@ CGAL_DEPRECATED bool read_las_points_with_properties(std::istream& is, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> CGAL_DEPRECATED bool read_las_points(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; - typename CGAL::GetPointMap, CGAL_BGL_NP_CLASS>::type point_map = - choose_parameter, CGAL_BGL_NP_CLASS>::type>(get_parameter(np, internal_np::point_map)); + typename CGAL::GetPointMap, CGAL_NP_CLASS>::type point_map = + choose_parameter, CGAL_NP_CLASS>::type>(get_parameter(np, internal_np::point_map)); return IO::read_LAS(is, output, make_las_point_reader(point_map)); } @@ -628,8 +628,8 @@ CGAL_DEPRECATED bool read_las_points(std::istream& is, // variant with default output iterator value type -template -CGAL_DEPRECATED bool read_las_points(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool read_las_points(std::istream& is, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_LAS::type>(is, output, np); } diff --git a/Point_set_processing_3/include/CGAL/IO/read_off_points.h b/Point_set_processing_3/include/CGAL/IO/read_off_points.h index ed0bc982382..783fd20c1fc 100644 --- a/Point_set_processing_3/include/CGAL/IO/read_off_points.h +++ b/Point_set_processing_3/include/CGAL/IO/read_off_points.h @@ -77,10 +77,10 @@ namespace IO { */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_OFF(std::istream& is, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = nullptr #endif @@ -92,7 +92,7 @@ bool read_OFF(std::istream& is, typedef Point_set_processing_3::Fake_point_range PointRange; // basic geometric types - typedef Point_set_processing_3_np_helper NP_helper; + typedef Point_set_processing_3_np_helper NP_helper; typedef typename NP_helper::Point_map PointMap; typedef typename NP_helper::Normal_map NormalMap; typedef typename NP_helper::Geom_traits Kernel; @@ -239,10 +239,10 @@ bool read_OFF(std::istream& is, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_OFF(const std::string& fname, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = nullptr #endif @@ -256,15 +256,15 @@ bool read_OFF(const std::string& fname, // variants with default output iterator value type template -bool read_OFF(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), + typename CGAL_NP_TEMPLATE_PARAMETERS> +bool read_OFF(std::istream& is, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { return read_OFF::type>(is, output, np); } -template -bool read_OFF(const std::string& fname, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool read_OFF(const std::string& fname, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { std::ifstream is(fname); @@ -422,10 +422,10 @@ bool read_off_points(std::istream& is, ///< input stream. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> CGAL_DEPRECATED bool read_off_points(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(is, output, np); } @@ -439,8 +439,8 @@ CGAL_DEPRECATED bool read_off_points(std::istream& is, OutputIterator output) } // variant with default output iterator value type -template -CGAL_DEPRECATED bool read_off_points(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool read_off_points(std::istream& is, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(is, output, np); } diff --git a/Point_set_processing_3/include/CGAL/IO/read_ply_points.h b/Point_set_processing_3/include/CGAL/IO/read_ply_points.h index d6c19fee0a5..1a0f7ed547b 100644 --- a/Point_set_processing_3/include/CGAL/IO/read_ply_points.h +++ b/Point_set_processing_3/include/CGAL/IO/read_ply_points.h @@ -239,10 +239,10 @@ bool read_PLY_with_properties(std::istream& is, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_PLY(std::istream& is, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = nullptr #endif @@ -254,7 +254,7 @@ bool read_PLY(std::istream& is, typedef Point_set_processing_3::Fake_point_range PointRange; // basic geometric types - typedef Point_set_processing_3_np_helper NP_helper; + typedef Point_set_processing_3_np_helper NP_helper; typedef typename NP_helper::Point_map PointMap; typedef typename NP_helper::Normal_map NormalMap; @@ -321,10 +321,10 @@ bool read_PLY(std::istream& is, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_PLY(const std::string& fname, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = nullptr #endif @@ -348,15 +348,15 @@ bool read_PLY(const std::string& fname, /// \cond SKIP_IN_MANUAL // variants with default output iterator value type -template -bool read_PLY(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool read_PLY(std::istream& is, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { return read_PLY::type>(is, output, np); } -template -bool read_PLY(const std::string& fname, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool read_PLY(const std::string& fname, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { return read_PLY::type>(fname, output, np); @@ -458,8 +458,8 @@ CGAL_DEPRECATED bool read_ply_points_with_properties(std::istream& is, OutputIte \deprecated This function is deprecated since \cgal 5.3, \link PkgPointSetProcessing3IOPly `CGAL::IO::read_PLY()` \endlink should be used instead. */ -template -CGAL_DEPRECATED bool read_ply_points(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool read_ply_points(std::istream& is, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_PLY(is, output, np); } @@ -475,8 +475,8 @@ CGAL_DEPRECATED bool read_ply_points_with_properties(std::istream& is, OutputIte // variant with default output iterator value type template -CGAL_DEPRECATED bool read_ply_points(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + typename CGAL_NP_TEMPLATE_PARAMETERS> +CGAL_DEPRECATED bool read_ply_points(std::istream& is, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_PLY::type>(is, output, np); } diff --git a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h index 71d458a6ec4..793c7e2e85f 100644 --- a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h +++ b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h @@ -74,10 +74,10 @@ namespace IO { */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_XYZ(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -85,7 +85,7 @@ bool read_XYZ(std::istream& is, typedef Point_set_processing_3::Fake_point_range PointRange; // basic geometric types - typedef Point_set_processing_3_np_helper NP_helper; + typedef Point_set_processing_3_np_helper NP_helper; typedef typename NP_helper::Point_map PointMap; typedef typename NP_helper::Normal_map NormalMap; typedef typename NP_helper::Geom_traits Kernel; @@ -223,10 +223,10 @@ bool read_XYZ(std::istream& is, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_XYZ(const std::string& fname, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { std::ifstream is(fname); return read_XYZ(is, output, np); @@ -235,15 +235,15 @@ bool read_XYZ(const std::string& fname, /// \cond SKIP_IN_MANUAL // variants with default output iterator value type -template -bool read_XYZ(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), +template +bool read_XYZ(std::istream& is, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { return read_XYZ::type>(is, output, np); } -template -bool read_XYZ(const std::string& fname, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool read_XYZ(const std::string& fname, OutputIterator output, const CGAL_NP_CLASS& np = parameters::default_values()) { std::ifstream is(fname); return read_XYZ::type>(is, output, np); @@ -406,20 +406,20 @@ bool read_xyz_points(std::istream& is, ///< input stream. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> CGAL_DEPRECATED bool read_xyz_points(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_XYZ(is, output, np); } /// \cond SKIP_IN_MANUAL template + typename CGAL_NP_TEMPLATE_PARAMETERS> CGAL_DEPRECATED bool read_xyz_points(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_XYZ::type>(is, output, np); } diff --git a/Point_set_processing_3/include/CGAL/IO/write_las_points.h b/Point_set_processing_3/include/CGAL/IO/write_las_points.h index 6f07afd945c..aa153ec4c44 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_las_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_las_points.h @@ -277,10 +277,10 @@ bool write_LAS_with_properties(std::ostream& os, ///< output stream. \sa \ref IOStreamLAS \sa `write_LAS_with_properties()` */ -template +template bool write_LAS(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -289,7 +289,7 @@ bool write_LAS(std::ostream& os, using parameters::choose_parameter; using parameters::get_parameter; - typedef typename CGAL::GetPointMap::type PointMap; + typedef typename CGAL::GetPointMap::type PointMap; PointMap point_map = choose_parameter(get_parameter(np, internal_np::point_map)); if(!os) @@ -332,10 +332,10 @@ bool write_LAS(std::ostream& os, \sa `write_LAS_with_properties()` */ -template +template bool write_LAS(const std::string& filename, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -402,8 +402,8 @@ CGAL_DEPRECATED bool write_las_points_with_properties(std::ostream& os, \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::write_LAS()` should be used instead. */ -template -bool write_las_points(std::ostream& os, const PointRange& points, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_las_points(std::ostream& os, const PointRange& points, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_LAS(os, points, np); } diff --git a/Point_set_processing_3/include/CGAL/IO/write_off_points.h b/Point_set_processing_3/include/CGAL/IO/write_off_points.h index a611b24bfeb..99daf882ac2 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_off_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_off_points.h @@ -34,21 +34,21 @@ namespace CGAL { namespace Point_set_processing_3 { namespace internal { -template +template bool write_OFF_PSP(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = CGAL::parameters::default_values()) + const CGAL_NP_CLASS& np = CGAL::parameters::default_values()) { using CGAL::parameters::choose_parameter; using CGAL::parameters::get_parameter; using CGAL::parameters::is_default_parameter; // basic geometric types - typedef Point_set_processing_3_np_helper NP_helper; + typedef Point_set_processing_3_np_helper NP_helper; typedef typename NP_helper::Const_point_map PointMap; typedef typename NP_helper::Normal_map NormalMap; - const bool has_normals = !(is_default_parameter()); + const bool has_normals = !(is_default_parameter()); PointMap point_map = NP_helper::get_const_point_map(points, np); NormalMap normal_map = NP_helper::get_normal_map(points, np); @@ -130,10 +130,10 @@ namespace IO { \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_OFF(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -186,10 +186,10 @@ bool write_OFF(std::ostream& os, \sa \ref IOStreamOFF */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_OFF(const std::string& filename, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -301,8 +301,8 @@ bool write_off_points(std::ostream& os, ///< output stream. \deprecated This function is deprecated since \cgal 5.3, \link PkgPointSetProcessing3IOOff `CGAL::IO::write_OFF()` \endlink should be used instead. */ -template -CGAL_DEPRECATED bool write_off_points(std::ostream& os, const PointRange& points, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool write_off_points(std::ostream& os, const PointRange& points, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_OFF(os, points, np); } diff --git a/Point_set_processing_3/include/CGAL/IO/write_ply_points.h b/Point_set_processing_3/include/CGAL/IO/write_ply_points.h index f0d6dfd9e9d..38b361ff779 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_ply_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_ply_points.h @@ -184,10 +184,10 @@ template +template bool write_PLY(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -197,7 +197,7 @@ bool write_PLY(std::ostream& os, using parameters::get_parameter; // basic geometric types - typedef Point_set_processing_3_np_helper NP_helper; + typedef Point_set_processing_3_np_helper NP_helper; typedef typename NP_helper::Const_point_map PointMap; typedef typename NP_helper::Normal_map NormalMap; @@ -272,10 +272,10 @@ bool write_PLY(std::ostream& os, \sa `write_PLY_with_properties()` */ -template +template bool write_PLY(const std::string& filename, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -374,8 +374,8 @@ CGAL_DEPRECATED bool write_ply_points_with_properties(std::ostream& os, ///< out \deprecated This function is deprecated since \cgal 5.3, \link PkgPointSetProcessing3IOPly `CGAL::IO::write_PLY()` \endlink should be used instead. */ -template -CGAL_DEPRECATED bool write_ply_points(std::ostream& os, const PointRange& points, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool write_ply_points(std::ostream& os, const PointRange& points, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_PLY(os, points, np); } diff --git a/Point_set_processing_3/include/CGAL/IO/write_points.h b/Point_set_processing_3/include/CGAL/IO/write_points.h index 6bbeef5b11c..712c03e03a6 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_points.h @@ -88,10 +88,10 @@ namespace IO { \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_points(const std::string& fname, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values(), + const CGAL_NP_CLASS& np = parameters::default_values(), #ifndef DOXYGEN_RUNNING typename boost::enable_if >::type* = nullptr #endif diff --git a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h index b8981a6ee0d..73610c9545f 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h @@ -34,16 +34,16 @@ namespace CGAL { namespace Point_set_processing_3 { namespace internal { -template +template bool write_XYZ_PSP(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = CGAL::parameters::default_values()) + const CGAL_NP_CLASS& np = CGAL::parameters::default_values()) { using CGAL::parameters::choose_parameter; using CGAL::parameters::get_parameter; // basic geometric types - typedef Point_set_processing_3_np_helper NP_helper; + typedef Point_set_processing_3_np_helper NP_helper; typedef typename NP_helper::Const_point_map PointMap; typedef typename NP_helper::Normal_map NormalMap; @@ -122,10 +122,10 @@ namespace IO { \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_XYZ(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -175,10 +175,10 @@ bool write_XYZ(std::ostream& os, \returns `true` if writing was successful, `false` otherwise. */ -template +template bool write_XYZ(const std::string& filename, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -287,8 +287,8 @@ bool write_xyz_points(std::ostream& os, ///< output stream. \deprecated This function is deprecated since \cgal 5.3, \link PkgPointSetProcessing3IOXyz `CGAL::write_XYZ()` \endlink should be used instead. */ -template -CGAL_DEPRECATED bool write_xyz_points(std::ostream& os, const PointRange& points, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool write_xyz_points(std::ostream& os, const PointRange& points, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_XYZ(os, points, np); } diff --git a/Point_set_processing_3/include/CGAL/compute_average_spacing.h b/Point_set_processing_3/include/CGAL/compute_average_spacing.h index 2699a1771ad..3b9c0f206c6 100644 --- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h +++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h @@ -145,24 +145,24 @@ compute_average_spacing(const typename NeighborQuery::Kernel::Point_3& query, // */ template #ifdef DOXYGEN_RUNNING FT #else - typename Point_set_processing_3_np_helper::FT + typename Point_set_processing_3_np_helper::FT #endif compute_average_spacing( const PointRange& points, unsigned int k, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; // basic geometric types typedef typename PointRange::const_iterator iterator; - typedef Point_set_processing_3_np_helper NP_helper; + typedef Point_set_processing_3_np_helper NP_helper; typedef typename NP_helper::Const_point_map PointMap; typedef typename NP_helper::Geom_traits Kernel; 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 aec7ad596e9..4cfd8557554 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 @@ -298,9 +298,9 @@ namespace internal { // * // */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> std::size_t number_of_connected_components(const PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::faces_size_type faces_size_type; typedef CGAL::dynamic_face_property_t Face_property_tag; @@ -600,12 +600,12 @@ std::size_t keep_large_connected_components(PolygonMesh& pmesh, template + , typename CGAL_NP_TEMPLATE_PARAMETERS> void keep_or_remove_connected_components(PolygonMesh& pmesh , const ComponentRange& components_to_keep , const FaceComponentMap& fcm , bool keep - , const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + , const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -616,7 +616,7 @@ void keep_or_remove_connected_components(PolygonMesh& pmesh typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits::edge_descriptor edge_descriptor; - typedef typename GetInitializedVertexIndexMap::type VertexIndexMap; + typedef typename GetInitializedVertexIndexMap::type VertexIndexMap; VertexIndexMap vim = get_initialized_vertex_index_map(pmesh, np); std::set cc_to_keep; @@ -720,13 +720,13 @@ void keep_or_remove_connected_components(PolygonMesh& pmesh for(vertex_descriptor v: vertices(pmesh)) if (!keep_vertex[v]) vertices_to_remove.push_back(v); - if ( is_default_parameter() ) + if ( is_default_parameter() ) for (vertex_descriptor v : vertices_to_remove) remove_vertex(v, pmesh); else { typedef typename internal_np::Lookup_named_param_def // default (not used) >::type Vertex_map; Vertex_map is_cst = choose_parameter(get_parameter(np, internal_np::vertex_is_constrained), @@ -871,10 +871,10 @@ void remove_connected_components(PolygonMesh& pmesh */ template + , typename CGAL_NP_TEMPLATE_PARAMETERS> void remove_connected_components(PolygonMesh& pmesh , const FaceRange& components_to_remove - , const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + , const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -885,7 +885,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); @@ -941,10 +941,10 @@ void remove_connected_components(PolygonMesh& pmesh */ template + , typename CGAL_NP_TEMPLATE_PARAMETERS> void keep_connected_components(PolygonMesh& pmesh , const FaceRange& components_to_keep - , const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + , const CGAL_NP_CLASS& np = parameters::default_values()) { typedef PolygonMesh PM; typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -952,7 +952,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/extrude.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h index c10ddf77600..58152b0fad2 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h @@ -158,15 +158,15 @@ template void extrude_mesh(const InputMesh& input, OutputMesh& output, const BottomFunctor& bot, const TopFunctor& top, - const CGAL_BGL_NP_CLASS_1& np_in = parameters::default_values(), - const CGAL_BGL_NP_CLASS_2& np_out = parameters::default_values()) + const CGAL_NP_CLASS_1& np_in = parameters::default_values(), + const CGAL_NP_CLASS_2& np_out = parameters::default_values()) { typedef typename boost::graph_traits::vertex_descriptor input_vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor input_halfedge_descriptor; @@ -175,8 +175,8 @@ void extrude_mesh(const InputMesh& input, typedef typename boost::graph_traits::halfedge_descriptor output_halfedge_descriptor; CGAL_assertion(!CGAL::is_closed(input)); - typedef typename GetVertexPointMap < OutputMesh, CGAL_BGL_NP_CLASS_2>::type VPMap; - typedef typename GetVertexPointMap < InputMesh, CGAL_BGL_NP_CLASS_1>::const_type IVPMap; + typedef typename GetVertexPointMap < OutputMesh, CGAL_NP_CLASS_2>::type VPMap; + typedef typename GetVertexPointMap < InputMesh, CGAL_NP_CLASS_1>::const_type IVPMap; using parameters::get_parameter; using parameters::choose_parameter; @@ -276,25 +276,25 @@ void extrude_mesh(const InputMesh& input, */ template + class CGAL_NP_TEMPLATE_PARAMETERS_1, + class CGAL_NP_TEMPLATE_PARAMETERS_2> void extrude_mesh(const InputMesh& input, OutputMesh& output, #ifdef DOXYGEN_RUNNING Vector_3 v, #else - typename GetGeomTraits::type::Vector_3 v, + typename GetGeomTraits::type::Vector_3 v, #endif - const CGAL_BGL_NP_CLASS_1& np_in = parameters::default_values(), - const CGAL_BGL_NP_CLASS_2& np_out = parameters::default_values()) + const CGAL_NP_CLASS_1& np_in = parameters::default_values(), + const CGAL_NP_CLASS_2& np_out = parameters::default_values()) { - typedef typename GetVertexPointMap < OutputMesh, CGAL_BGL_NP_CLASS_2>::type VPMap; + typedef typename GetVertexPointMap < OutputMesh, CGAL_NP_CLASS_2>::type VPMap; VPMap output_vpm = parameters::choose_parameter(parameters::get_parameter(np_out, internal_np::vertex_point), get_property_map(vertex_point, output)); extrude_impl::Const_dist_translation< - typename GetVertexPointMap::type, - typename GetGeomTraits::type::Vector_3> bot(output_vpm, + typename GetVertexPointMap::type, + typename GetGeomTraits::type::Vector_3> bot(output_vpm, v); extrude_impl::Identity_functor top; extrude_mesh(input, output, bot,top, np_in, np_out); 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 d4caa4a7828..62d9853d6b4 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 @@ -1357,10 +1357,10 @@ std::size_t snap_borders(TriangleMesh& tm_A, template + typename CGAL_NP_TEMPLATE_PARAMETERS> std::size_t snap_borders(TriangleMesh& tm, ToleranceMap tolerance_map, - const CGAL_BGL_NP_CLASS& np = parameters::default_values(), + const CGAL_NP_CLASS& np = parameters::default_values(), const typename std::enable_if_t::value>* = 0 ) { @@ -1376,9 +1376,9 @@ std::size_t snap_borders(TriangleMesh& tm, template + typename CGAL_NP_TEMPLATE_PARAMETERS> std::size_t snap_borders(TriangleMesh& tm, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { 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 004b4381771..2c445fdc14d 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 @@ -1218,16 +1218,16 @@ std::size_t snap_vertices(const HalfedgeRange_A& halfedge_range_A, template + typename CGAL_NP_TEMPLATE_PARAMETERS_1, + typename CGAL_NP_TEMPLATE_PARAMETERS_2> std::size_t snap_vertices(const HalfedgeRange_A& halfedge_range_A, PolygonMesh& tm_A, const HalfedgeRange_B& halfedge_range_B, PolygonMesh& tm_B, - const CGAL_BGL_NP_CLASS_1& np_A=parameters::default_values(), - const CGAL_BGL_NP_CLASS_2& np_B=parameters::default_values()) + const CGAL_NP_CLASS_1& np_A=parameters::default_values(), + const CGAL_NP_CLASS_2& np_B=parameters::default_values()) { - typedef typename GetGeomTraits::type GT; + typedef typename GetGeomTraits::type GT; typedef typename GT::FT FT; typedef CGAL::dynamic_vertex_property_t Vertex_property_tag; typedef typename boost::property_map::type Tolerance_map; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h index 7d6cbe5b8df..57707a31233 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h @@ -1251,12 +1251,12 @@ bool do_intersect(const Polyline& polyline1, * */ template + class CGAL_NP_TEMPLATE_PARAMETERS_1, + class CGAL_NP_TEMPLATE_PARAMETERS_2> bool do_intersect(const TriangleMesh& tm1, const TriangleMesh& tm2, - const CGAL_BGL_NP_CLASS_1& np1 = parameters::default_values(), - const CGAL_BGL_NP_CLASS_2& np2 = parameters::default_values() + const CGAL_NP_CLASS_1& np1 = parameters::default_values(), + const CGAL_NP_CLASS_2& np2 = parameters::default_values() #ifndef DOXYGEN_RUNNING , const typename boost::disable_if< typename boost::has_range_const_iterator::type @@ -1285,13 +1285,13 @@ bool do_intersect(const TriangleMesh& tm1, if (test_overlap) { - typedef typename GetVertexPointMap::const_type VertexPointMap1; - typedef typename GetVertexPointMap::const_type VertexPointMap2; + typedef typename GetVertexPointMap::const_type VertexPointMap1; + typedef typename GetVertexPointMap::const_type VertexPointMap2; VertexPointMap1 vpm1 = choose_parameter(get_parameter(np1, internal_np::vertex_point), get_const_property_map(boost::vertex_point, tm1)); VertexPointMap2 vpm2 = choose_parameter(get_parameter(np2, internal_np::vertex_point), get_const_property_map(boost::vertex_point, tm2)); - typedef typename GetGeomTraits::type GeomTraits; + typedef typename GetGeomTraits::type GeomTraits; GeomTraits gt = choose_parameter(get_parameter(np1, internal_np::geom_traits)); return internal::is_mesh2_in_mesh1(tm1, tm2, vpm1, vpm2, gt) || @@ -1402,10 +1402,10 @@ bool do_intersect(const TriangleMesh& tm, */ template + class CGAL_NP_TEMPLATE_PARAMETERS> bool do_intersect(const TriangleMesh& tm, const Polyline& polyline, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , const typename boost::disable_if< typename boost::mpl::or_< 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 7651a1a944e..a1d5448896b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h @@ -38,8 +38,8 @@ namespace CGAL { // workaround for area(face_range, tm) overload -template -class GetGeomTraits +template +class GetGeomTraits { public: struct type{}; @@ -397,15 +397,15 @@ longest_border(const PolygonMesh& pmesh, * @sa `area()` */ template + typename CGAL_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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -414,14 +414,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)), @@ -469,15 +469,15 @@ face_area(typename boost::graph_traits::face_descriptor f, * @sa `face_area()` */ template + typename CGAL_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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -486,14 +486,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)), @@ -546,19 +546,19 @@ squared_face_area(typename boost::graph_traits::face_descriptor f, */ template + typename CGAL_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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { 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); @@ -607,13 +607,13 @@ area(FaceRange face_range, * @sa `face_area()` */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> #ifdef DOXYGEN_RUNNING FT #else -typename GetGeomTraits::type::FT +typename GetGeomTraits::type::FT #endif -area(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +area(const TriangleMesh& tmesh, const CGAL_NP_CLASS& np = parameters::default_values()) { return area(faces(tmesh), tmesh, np); } @@ -654,14 +654,14 @@ area(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::defaul * of `tmesh`. */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> #ifdef DOXYGEN_RUNNING FT #else -typename GetGeomTraits::type::FT +typename GetGeomTraits::type::FT #endif volume(const TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { CGAL_assertion(is_triangle_mesh(tmesh)); CGAL_assertion(is_closed(tmesh)); @@ -669,14 +669,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; @@ -727,27 +727,27 @@ volume(const TriangleMesh& tmesh, * */ template + typename CGAL_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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { 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)); @@ -833,13 +833,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_BGL_NP_CLASS& np = parameters::default_values()) +centroid(const TriangleMesh& tmesh, const CGAL_NP_CLASS& np = parameters::default_values()) { // See: http://www2.imperial.ac.uk/~rn/centroid.pdf @@ -849,11 +849,11 @@ centroid(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::de 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/repair_degeneracies.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h index 386f789995b..fb5f52785fd 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 @@ -908,12 +908,12 @@ bool remove_almost_degenerate_faces(const FaceRange& face_range, return false; } -template +template bool remove_almost_degenerate_faces(TriangleMesh& tmesh, const double cap_threshold, const double needle_threshold, const double collapse_length_threshold, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { return remove_almost_degenerate_faces(faces(tmesh), tmesh, cap_threshold, needle_threshold, collapse_length_threshold, np); @@ -1705,18 +1705,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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { 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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { std::set::face_descriptor> face_set; return remove_degenerate_edges(edges(tmesh), tmesh, face_set, np); @@ -2579,9 +2579,9 @@ bool remove_degenerate_faces(const FaceRange& face_range, return all_removed; } -template +template bool remove_degenerate_faces(TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { return remove_degenerate_faces(faces(tmesh), tmesh, np); } 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 042ae75c4f8..18b4b07940e 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 @@ -2104,8 +2104,8 @@ bool remove_self_intersections(const FaceRange& face_range, return step < max_steps; } -template -bool remove_self_intersections(TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool remove_self_intersections(TriangleMesh& tmesh, const CGAL_NP_CLASS& np = parameters::default_values()) { 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 5f3bf9720f5..76a29eec6c2 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 @@ -520,11 +520,11 @@ self_intersections(const FaceRange& face_range, template + class CGAL_NP_TEMPLATE_PARAMETERS> FacePairOutputIterator self_intersections(const TriangleMesh& tmesh, FacePairOutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { return self_intersections(faces(tmesh), tmesh, out, np); } @@ -632,9 +632,9 @@ bool does_self_intersect(const FaceRange& face_range, */ template + class CGAL_NP_TEMPLATE_PARAMETERS> bool does_self_intersect(const TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { 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 05d03dd599a..a811060949c 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 @@ -114,11 +114,11 @@ bool is_degenerate_edge(typename boost::graph_traits::edge_descript /// \cgalParamExtra{The geometric traits class must be compatible with the vertex point type.} /// \cgalParamNEnd /// \cgalNamedParamsEnd -template +template OutputIterator degenerate_edges(const EdgeRange& edges, const TriangleMesh& tm, OutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::edge_descriptor edge_descriptor; @@ -134,10 +134,10 @@ OutputIterator degenerate_edges(const EdgeRange& edges, /// /// See above for the comprehensive description of the parameters. /// -template +template OutputIterator degenerate_edges(const TriangleMesh& tm, OutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() ) { return degenerate_edges(edges(tm), tm, out, np); @@ -229,11 +229,11 @@ bool is_degenerate_triangle_face(typename boost::graph_traits::fac /// \cgalParamNEnd /// \cgalNamedParamsEnd /// -template +template OutputIterator degenerate_faces(const FaceRange& faces, const TriangleMesh& tm, OutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -250,10 +250,10 @@ OutputIterator degenerate_faces(const FaceRange& faces, /// /// See above for the comprehensive description of the parameters. /// -template +template OutputIterator degenerate_faces(const TriangleMesh& tm, OutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() ) { return degenerate_faces(faces(tm), tm, out, np); 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 dc20d5b409c..e7c7f1eb271 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 @@ -324,8 +324,8 @@ void smooth_mesh(const FaceRange& faces, } ///\cond SKIP_IN_MANUAL -template -void smooth_mesh(TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +void smooth_mesh(TriangleMesh& tmesh, const CGAL_NP_CLASS& np = parameters::default_values()) { 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 9267bceea4e..a8ff2ce530c 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 @@ -197,10 +197,10 @@ void smooth_shape(const FaceRange& faces, } /// \cond SKIP_IN_MANUAL -template +template void smooth_shape(TriangleMesh& tmesh, const double time, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { 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 13870aadfb8..ee402ae99b3 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 @@ -361,20 +361,20 @@ template + typename CGAL_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_BGL_NP_CLASS& np) + const CGAL_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)); @@ -1021,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_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename std::pair halfedges_pair; @@ -1037,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()); @@ -1114,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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { internal::Dummy_cycle_rep_maintainer dummy_maintainer(pmesh); return internal::stitch_boundary_cycle(h, pmesh, dummy_maintainer, np); @@ -1126,11 +1126,11 @@ std::size_t stitch_boundary_cycle(const typename boost::graph_traits + typename CycleRepMaintainer, typename CGAL_NP_TEMPLATE_PARAMETERS> std::size_t stitch_boundary_cycles(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, CycleRepMaintainer& cycle_reps_maintainer, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1175,10 +1175,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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { // 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 @@ -1189,9 +1189,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_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1242,10 +1242,10 @@ std::size_t stitch_boundary_cycles(PolygonMesh& pmesh, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> std::size_t stitch_borders(PolygonMesh& pmesh, const HalfedgePairsRange& hedge_pairs_to_stitch, - const CGAL_BGL_NP_CLASS& np = parameters::default_values(), + const CGAL_NP_CLASS& np = parameters::default_values(), typename boost::enable_if< typename boost::has_range_iterator >::type* = 0) @@ -1253,7 +1253,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)); @@ -1264,11 +1264,11 @@ namespace internal { template + typename CGAL_NP_TEMPLATE_PARAMETERS> std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, CycleRepMaintainer& cycle_maintainer, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1278,12 +1278,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()); @@ -1374,9 +1374,9 @@ 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(PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1435,10 +1435,10 @@ std::size_t stitch_borders(PolygonMesh& pmesh, /// \sa `stitch_boundary_cycle()` /// \sa `stitch_boundary_cycles()` /// -template +template std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if< typename boost::has_range_iterator 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 714b1c7805f..8af96b4cb2e 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 @@ -579,11 +579,11 @@ bool use_dt3 = */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> OutputIterator triangulate_hole_polyline(const PointRange& points, OutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { 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 b75bd7f1b38..03309fd9027 100644 --- a/Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h +++ b/Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h @@ -2220,10 +2220,10 @@ public: * the initial list of prisms. * \todo apply that to the soup versions */ - template + template bool operator()(const TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = 0 #endif @@ -2232,7 +2232,7 @@ public: 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/include/CGAL/IO/Polyhedron_OFF_iostream.h b/Polyhedron/include/CGAL/IO/Polyhedron_OFF_iostream.h index 80ea58d4484..1bbe27f4999 100644 --- a/Polyhedron/include/CGAL/IO/Polyhedron_OFF_iostream.h +++ b/Polyhedron/include/CGAL/IO/Polyhedron_OFF_iostream.h @@ -40,10 +40,10 @@ namespace IO { template class HDS, - class Alloc, class CGAL_BGL_NP_TEMPLATE_PARAMETERS> + class Alloc, class CGAL_NP_TEMPLATE_PARAMETERS> bool read_OFF(std::istream& in, Polyhedron_3& P, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits >::vertex_descriptor Vertex; @@ -54,7 +54,7 @@ bool read_OFF(std::istream& in, typedef typename Kernel_traits::Kernel Def_kernel; typedef typename CGAL::GetVertexPointMap, - CGAL_BGL_NP_CLASS>::type VPM; + CGAL_NP_CLASS>::type VPM; typedef typename boost::property_traits::value_type Point; typedef typename Kernel_traits::Kernel Kernel; @@ -66,17 +66,17 @@ bool read_OFF(std::istream& in, const bool verbose = choose_parameter(get_parameter(np, internal_np::verbose), true); - if(!(is_default_parameter()) || - !(is_default_parameter()) || - !(is_default_parameter()) || - !(is_default_parameter())) + if(!(is_default_parameter()) || + !(is_default_parameter()) || + !(is_default_parameter()) || + !(is_default_parameter())) { return CGAL::IO::internal::read_OFF_BGL(in, P, np); } CGAL::scan_OFF(in, P, verbose); - if(!parameters::is_default_parameter()) + if(!parameters::is_default_parameter()) { Def_VPM def_vpm = get_property_map(CGAL::vertex_point, P); VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), @@ -93,10 +93,10 @@ bool read_OFF(std::istream& in, template class HDS, - class Alloc, class CGAL_BGL_NP_TEMPLATE_PARAMETERS> + class Alloc, class CGAL_NP_TEMPLATE_PARAMETERS> bool read_OFF(const std::string& fname, Polyhedron_3& P, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { std::ifstream in(fname); return read_OFF(in, P, np); @@ -123,26 +123,26 @@ namespace IO { template < class Traits, class Items, template < class T, class I, class A> class HDS, - class Alloc, class CGAL_BGL_NP_TEMPLATE_PARAMETERS> + class Alloc, class CGAL_NP_TEMPLATE_PARAMETERS> bool write_OFF(std::ostream& out, const Polyhedron_3& P, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; using parameters::is_default_parameter; - if(!(is_default_parameter()) || - !(is_default_parameter()) || - !(is_default_parameter()) || - !(is_default_parameter())) + if(!(is_default_parameter()) || + !(is_default_parameter()) || + !(is_default_parameter()) || + !(is_default_parameter())) { return CGAL::IO::internal::write_OFF_BGL(out, P, np); } // writes P to `out' in PRETTY, ASCII or BINARY format as the stream indicates. File_header_OFF header(is_binary(out), ! is_pretty(out), false); - typename CGAL::GetVertexPointMap, CGAL_BGL_NP_CLASS>::const_type + typename CGAL::GetVertexPointMap, CGAL_NP_CLASS>::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, P)); diff --git a/STL_Extension/include/CGAL/Named_function_parameters.h b/STL_Extension/include/CGAL/Named_function_parameters.h index b0aa3efddc8..12f230a4a46 100644 --- a/STL_Extension/include/CGAL/Named_function_parameters.h +++ b/STL_Extension/include/CGAL/Named_function_parameters.h @@ -21,14 +21,14 @@ #include #include -#define CGAL_BGL_NP_TEMPLATE_PARAMETERS NP_T=bool, typename NP_Tag=CGAL::internal_np::all_default_t, typename NP_Base=CGAL::internal_np::No_property -#define CGAL_BGL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT NP_T, typename NP_Tag, typename NP_Base -#define CGAL_BGL_NP_CLASS CGAL::Named_function_parameters +#define CGAL_NP_TEMPLATE_PARAMETERS NP_T=bool, typename NP_Tag=CGAL::internal_np::all_default_t, typename NP_Base=CGAL::internal_np::No_property +#define CGAL_NP_TEMPLATE_PARAMETERS_NO_DEFAULT NP_T, typename NP_Tag, typename NP_Base +#define CGAL_NP_CLASS CGAL::Named_function_parameters -#define CGAL_BGL_NP_TEMPLATE_PARAMETERS_1 NP_T1=bool, typename NP_Tag1=CGAL::internal_np::all_default_t, typename NP_Base1=CGAL::internal_np::No_property -#define CGAL_BGL_NP_CLASS_1 CGAL::Named_function_parameters -#define CGAL_BGL_NP_TEMPLATE_PARAMETERS_2 NP_T2=bool, typename NP_Tag2=CGAL::internal_np::all_default_t, typename NP_Base2=CGAL::internal_np::No_property -#define CGAL_BGL_NP_CLASS_2 CGAL::Named_function_parameters +#define CGAL_NP_TEMPLATE_PARAMETERS_1 NP_T1=bool, typename NP_Tag1=CGAL::internal_np::all_default_t, typename NP_Base1=CGAL::internal_np::No_property +#define CGAL_NP_CLASS_1 CGAL::Named_function_parameters +#define CGAL_NP_TEMPLATE_PARAMETERS_2 NP_T2=bool, typename NP_Tag2=CGAL::internal_np::all_default_t, typename NP_Base2=CGAL::internal_np::No_property +#define CGAL_NP_CLASS_2 CGAL::Named_function_parameters namespace CGAL { namespace internal_np{ diff --git a/Stream_support/include/CGAL/IO/GOCAD.h b/Stream_support/include/CGAL/IO/GOCAD.h index 6d94dd36db9..d0701c952e0 100644 --- a/Stream_support/include/CGAL/IO/GOCAD.h +++ b/Stream_support/include/CGAL/IO/GOCAD.h @@ -40,12 +40,12 @@ namespace IO { /// \cond SKIP_IN_MANUAL -template +template bool read_GOCAD(std::istream& is, std::pair& name_and_color, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef typename boost::range_value::type Point; typedef typename boost::range_value::type Poly; @@ -189,11 +189,11 @@ bool read_GOCAD(std::istream& is, * * \returns `true` if the reading was successful, `false` otherwise. */ -template +template bool read_GOCAD(std::istream& is, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -234,11 +234,11 @@ bool read_GOCAD(std::istream& is, * * \returns `true` if the reading was successful, `false` otherwise. */ -template +template bool read_GOCAD(const std::string& fname, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -258,19 +258,19 @@ namespace internal { template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_GOCAD(std::ostream& os, const char* fname, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef typename boost::range_value::type Poly; using parameters::choose_parameter; using parameters::get_parameter; - typedef typename CGAL::GetPointMap::type PointMap; + typedef typename CGAL::GetPointMap::type PointMap; PointMap point_map = choose_parameter(get_parameter(np, internal_np::point_map)); if(!os.good()) @@ -342,11 +342,11 @@ bool write_GOCAD(std::ostream& os, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_GOCAD(std::ostream& os, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -384,11 +384,11 @@ bool write_GOCAD(std::ostream& os, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_GOCAD(const std::string& fname, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/OBJ.h b/Stream_support/include/CGAL/IO/OBJ.h index 8d59dd20320..1bbe0e264eb 100644 --- a/Stream_support/include/CGAL/IO/OBJ.h +++ b/Stream_support/include/CGAL/IO/OBJ.h @@ -206,11 +206,11 @@ bool read_OBJ(std::istream& is, /// \cgalNamedParamsEnd /// /// \returns `true` if the reading was successful, `false` otherwise. -template +template bool read_OBJ(std::istream& is, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -251,11 +251,11 @@ bool read_OBJ(std::istream& is, /// \cgalNamedParamsEnd /// /// \returns `true` if the reading was successful, `false` otherwise. -template +template bool read_OBJ(const std::string& fname, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -299,11 +299,11 @@ bool read_OBJ(const std::string& fname, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_OBJ(std::ostream& os, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -343,11 +343,11 @@ bool write_OBJ(std::ostream& os, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_OBJ(const std::string& fname, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/OFF.h b/Stream_support/include/CGAL/IO/OFF.h index 76787a9dac4..4dc678064d1 100644 --- a/Stream_support/include/CGAL/IO/OFF.h +++ b/Stream_support/include/CGAL/IO/OFF.h @@ -178,11 +178,11 @@ bool read_OFF(std::istream& is, * * \returns `true` if the reading was successful, `false` otherwise. */ -template +template bool read_OFF(std::istream& is, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -231,11 +231,11 @@ bool read_OFF(std::istream& is, * * \returns `true` if the reading was successful, `false` otherwise. */ -template +template bool read_OFF(const std::string& fname, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -276,11 +276,11 @@ bool read_OFF(const std::string& fname, * * \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_OFF(std::ostream& os, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -317,11 +317,11 @@ bool write_OFF(std::ostream& os, * * \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_OFF(const std::string& fname, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/PLY.h b/Stream_support/include/CGAL/IO/PLY.h index 4e8cc448eb9..672cefeaead 100644 --- a/Stream_support/include/CGAL/IO/PLY.h +++ b/Stream_support/include/CGAL/IO/PLY.h @@ -303,11 +303,11 @@ bool read_PLY(std::istream& is, * * \returns `true` if the reading was successful, `false` otherwise. */ -template +template bool read_PLY(std::istream& is, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -363,11 +363,11 @@ bool read_PLY(std::istream& is, * * \returns `true` if the reading was successful, `false` otherwise. */ -template +template bool read_PLY(const std::string& fname, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -426,11 +426,11 @@ bool read_PLY(const std::string& fname, * * \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_PLY(std::ostream& out, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -505,11 +505,11 @@ bool write_PLY(std::ostream& out, * * \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_PLY(const std::string& fname, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/STL.h b/Stream_support/include/CGAL/IO/STL.h index 8ebef216cf2..78f3fb65d7e 100644 --- a/Stream_support/include/CGAL/IO/STL.h +++ b/Stream_support/include/CGAL/IO/STL.h @@ -68,11 +68,11 @@ namespace IO { * * \returns `true` if the reading was successful, `false` otherwise. */ -template +template bool read_STL(std::istream& is, PointRange& points, TriangleRange& facets, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -202,11 +202,11 @@ bool read_STL(std::istream& is, * * \returns `true` if the reading was successful, `false` otherwise. */ -template +template bool read_STL(const std::string& fname, PointRange& points, TriangleRange& facets, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -268,11 +268,11 @@ bool read_STL(const std::string& fname, * * \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_STL(std::ostream& os, const PointRange& points, const TriangleRange& facets, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -283,7 +283,7 @@ bool write_STL(std::ostream& os, using parameters::choose_parameter; using parameters::get_parameter; - typedef typename CGAL::GetPointMap::type PointMap; + typedef typename CGAL::GetPointMap::type PointMap; PointMap point_map = choose_parameter(get_parameter(np, internal_np::point_map)); typedef typename boost::property_traits::value_type Point; @@ -376,11 +376,11 @@ bool write_STL(std::ostream& os, * * \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_STL(const std::string& fname, const PointRange& points, const TriangleRange& facets, - const CGAL_BGL_NP_CLASS& np = parameters::default_values() + const CGAL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/VTK.h b/Stream_support/include/CGAL/IO/VTK.h index 6373040dcf2..8878fde1523 100644 --- a/Stream_support/include/CGAL/IO/VTK.h +++ b/Stream_support/include/CGAL/IO/VTK.h @@ -374,11 +374,11 @@ void write_soup_polys_points(std::ostream& os, */ template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_VTP(std::ostream& os, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; @@ -460,11 +460,11 @@ bool write_VTP(std::ostream& os, * * \return `true` if the writing was successful, `false` otherwise. */ -template +template bool write_VTP(const std::string& fname, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { const bool binary = CGAL::parameters::choose_parameter(CGAL::parameters::get_parameter(np, internal_np::use_binary_mode), true); if(binary) diff --git a/Stream_support/include/CGAL/IO/polygon_soup_io.h b/Stream_support/include/CGAL/IO/polygon_soup_io.h index ec1a38a259e..098d088680b 100644 --- a/Stream_support/include/CGAL/IO/polygon_soup_io.h +++ b/Stream_support/include/CGAL/IO/polygon_soup_io.h @@ -73,11 +73,11 @@ namespace IO { * * \return `true` if reading was successful, `false` otherwise. */ -template +template bool read_polygon_soup(const std::string& fname, PointRange& points, PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { const bool verbose = parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), false); @@ -153,11 +153,11 @@ bool read_polygon_soup(const std::string& fname, * * \return `true` if writing was successful, `false` otherwise. */ -template +template bool write_polygon_soup(const std::string& fname, const PointRange& points, const PolygonRange& polygons, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { const bool verbose = parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), false); diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h b/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h index 66f6f3b891c..fb4d3111a3e 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h @@ -92,17 +92,17 @@ public: NamedParameters, DefaultMap_const>::type const_type; }; -template +template bool read_OFF_with_or_without_fcolors(std::istream& is, Surface_mesh& sm, const CGAL::File_scanner_OFF& scanner, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef Surface_mesh Mesh; typedef typename Mesh::Face_index Face_index; typedef CGAL::IO::Color Color; - typedef typename GetFaceColorMap::type FCM; + typedef typename GetFaceColorMap::type FCM; using parameters::choose_parameter; using parameters::is_default_parameter; @@ -110,7 +110,7 @@ bool read_OFF_with_or_without_fcolors(std::istream& is, typename Mesh::template Property_map fcm; - bool is_fcm_requested = !(is_default_parameter()); + bool is_fcm_requested = !(is_default_parameter()); if(!is_fcm_requested && scanner.has_colors()) { bool created; @@ -130,18 +130,18 @@ bool read_OFF_with_or_without_fcolors(std::istream& is, } } -template +template bool read_OFF_with_or_without_vtextures(std::istream& is, Surface_mesh& sm, const CGAL::File_scanner_OFF& scanner, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef Surface_mesh Mesh; typedef typename Mesh::Vertex_index Vertex_index; - typedef typename GetK, CGAL_BGL_NP_CLASS>::Kernel K; + typedef typename GetK, CGAL_NP_CLASS>::Kernel K; typedef typename K::Point_2 Texture; - typedef typename GetVertexTextureMap::type VTM; + typedef typename GetVertexTextureMap::type VTM; using parameters::choose_parameter; using parameters::is_default_parameter; @@ -149,7 +149,7 @@ bool read_OFF_with_or_without_vtextures(std::istream& is, typename Mesh::template Property_map vtm; - bool is_vtm_requested = !(is_default_parameter()); + bool is_vtm_requested = !(is_default_parameter()); if(!is_vtm_requested && scanner.has_textures()) { bool created; @@ -169,17 +169,17 @@ bool read_OFF_with_or_without_vtextures(std::istream& is, } } -template +template bool read_OFF_with_or_without_vcolors(std::istream& is, Surface_mesh& sm, const CGAL::File_scanner_OFF& scanner, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef Surface_mesh Mesh; typedef typename Mesh::Vertex_index Vertex_index; typedef CGAL::IO::Color Color; - typedef typename GetVertexColorMap::type VCM; + typedef typename GetVertexColorMap::type VCM; using parameters::choose_parameter; using parameters::is_default_parameter; @@ -187,7 +187,7 @@ bool read_OFF_with_or_without_vcolors(std::istream& is, typename Mesh::template Property_map vcm; - bool is_vcm_requested = !(is_default_parameter()); + bool is_vcm_requested = !(is_default_parameter()); if(!is_vcm_requested && scanner.has_colors()) { bool created; @@ -207,18 +207,18 @@ bool read_OFF_with_or_without_vcolors(std::istream& is, } } -template +template bool read_OFF_with_or_without_vnormals(std::istream& is, Surface_mesh& sm, const CGAL::File_scanner_OFF& scanner, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef Surface_mesh Mesh; typedef typename Mesh::Vertex_index Vertex_index; - typedef typename GetK, CGAL_BGL_NP_CLASS>::Kernel K; + typedef typename GetK, CGAL_NP_CLASS>::Kernel K; typedef typename K::Vector_3 Normal; - typedef typename GetVertexNormalMap::type VNM; + typedef typename GetVertexNormalMap::type VNM; using parameters::choose_parameter; using parameters::is_default_parameter; @@ -226,7 +226,7 @@ bool read_OFF_with_or_without_vnormals(std::istream& is, typename Mesh::template Property_map vnm; - bool is_vnm_requested = !(is_default_parameter()); + bool is_vnm_requested = !(is_default_parameter()); if(!is_vnm_requested && scanner.has_normals()) { bool created; @@ -319,10 +319,10 @@ bool read_OFF_with_or_without_vnormals(std::istream& is, /// the `failbit` of `is` is set and the mesh cleared. /// template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_OFF(std::istream& is, Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -340,10 +340,10 @@ bool read_OFF(std::istream& is, } template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool read_OFF(const std::string& fname, Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { std::ifstream in(fname.c_str()); return read_OFF(in, sm, np); @@ -357,8 +357,8 @@ bool read_OFF(const std::string& fname, \ingroup PkgSurfaceMeshIOFuncDeprecated \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::read_OFF(std::istream&, const Surface_mesh&)` should be used instead. */ -template -CGAL_DEPRECATED bool read_off(std::istream& is, Surface_mesh& sm, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool read_off(std::istream& is, Surface_mesh& sm, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(is, sm, np); } @@ -381,10 +381,10 @@ CGAL_DEPRECATED bool read_off(Surface_mesh& sm, const std::string& filena namespace IO { namespace internal { -template +template bool write_OFF_with_or_without_fcolors(std::ostream& os, const Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef Surface_mesh Mesh; typedef typename Mesh::Face_index Face_index; @@ -394,7 +394,7 @@ bool write_OFF_with_or_without_fcolors(std::ostream& os, using parameters::is_default_parameter; using parameters::get_parameter; - const bool has_fcolors = !(is_default_parameter()); + const bool has_fcolors = !(is_default_parameter()); typename Mesh::template Property_map fcolors; bool has_internal_fcolors; @@ -406,22 +406,22 @@ bool write_OFF_with_or_without_fcolors(std::ostream& os, return write_OFF_BGL(os, sm, np); } -template +template bool write_OFF_with_or_without_vtextures(std::ostream& os, const Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef Surface_mesh Mesh; typedef typename Mesh::Vertex_index Vertex_index; - typedef typename GetK, CGAL_BGL_NP_CLASS>::Kernel K; + typedef typename GetK, CGAL_NP_CLASS>::Kernel K; typedef typename K::Point_2 Texture; using parameters::choose_parameter; using parameters::is_default_parameter; using parameters::get_parameter; - const bool has_vtextures = !(is_default_parameter()); + const bool has_vtextures = !(is_default_parameter()); typename Mesh::template Property_map vtextures; bool has_internal_vtextures; @@ -433,10 +433,10 @@ bool write_OFF_with_or_without_vtextures(std::ostream& os, return write_OFF_with_or_without_fcolors(os, sm, np); } -template +template bool write_OFF_with_or_without_vcolors(std::ostream& os, const Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef Surface_mesh Mesh; typedef typename Mesh::Vertex_index Vertex_index; @@ -446,7 +446,7 @@ bool write_OFF_with_or_without_vcolors(std::ostream& os, using parameters::is_default_parameter; using parameters::get_parameter; - const bool has_vcolors = !(is_default_parameter()); + const bool has_vcolors = !(is_default_parameter()); typename Mesh::template Property_map vcolors; bool has_internal_vcolors; @@ -458,22 +458,22 @@ bool write_OFF_with_or_without_vcolors(std::ostream& os, return write_OFF_with_or_without_vtextures(os, sm, np); } -template +template bool write_OFF_with_or_without_vnormals(std::ostream& os, const Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np) + const CGAL_NP_CLASS& np) { typedef Surface_mesh Mesh; typedef typename Mesh::Vertex_index Vertex_index; - typedef typename GetK, CGAL_BGL_NP_CLASS>::Kernel K; + typedef typename GetK, CGAL_NP_CLASS>::Kernel K; typedef typename K::Vector_3 Normal; using parameters::choose_parameter; using parameters::is_default_parameter; using parameters::get_parameter; - const bool has_vnormals = !(is_default_parameter()); + const bool has_vnormals = !(is_default_parameter()); typename Mesh::template Property_map vnormals; bool has_internal_vnormals; @@ -554,16 +554,16 @@ bool write_OFF_with_or_without_vnormals(std::ostream& os, /// /// \returns `true` if writing was successful, `false` otherwise. /// -template +template bool write_OFF(std::ostream& os, const Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::is_default_parameter; using parameters::get_parameter; - const bool has_vpoints = !(is_default_parameter()); + const bool has_vpoints = !(is_default_parameter()); if(has_vpoints) return internal::write_OFF_with_or_without_vnormals(os, sm, np); @@ -578,8 +578,8 @@ bool write_OFF(std::ostream& os, \ingroup PkgSurfaceMeshIOFuncDeprecated \deprecated This function is deprecated since \cgal 5.3, `CGAL::IO::write_OFF(std::ostream&, const Surface_mesh&)` should be used instead. */ -template -CGAL_DEPRECATED bool write_off(std::ostream& os, const Surface_mesh& sm, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +CGAL_DEPRECATED bool write_off(std::ostream& os, const Surface_mesh& sm, const CGAL_NP_CLASS& np = parameters::default_values()) { return IO::write_OFF(os, sm, np); } diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h index 6f37f8604fb..1e59286bd01 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h @@ -907,11 +907,11 @@ namespace IO { /// /// \returns `true` if writing was successful, `false` otherwise. template + typename CGAL_NP_TEMPLATE_PARAMETERS> bool write_PLY(std::ostream& os, const Surface_mesh

& sm, const std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::default_values()) + const CGAL_NP_CLASS& np = parameters::default_values()) { typedef Surface_mesh

SMesh; typedef typename SMesh::Vertex_index VIndex; @@ -1106,8 +1106,8 @@ bool write_PLY(std::ostream& os, /// \cond SKIP_IN_MANUAL -template -bool write_PLY(std::ostream& os, const Surface_mesh

& sm, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) +template +bool write_PLY(std::ostream& os, const Surface_mesh

& sm, const CGAL_NP_CLASS& np = parameters::default_values()) { std::string unused_comment; return write_PLY(os, sm, unused_comment, np);