diff --git a/BGL/doc/BGL/NamedParameters.txt b/BGL/doc/BGL/NamedParameters.txt index 5a6149f26ce..8fad0e16910 100644 --- a/BGL/doc/BGL/NamedParameters.txt +++ b/BGL/doc/BGL/NamedParameters.txt @@ -24,7 +24,7 @@ The named parameters in the snippet use the tags `predecessor_map` and `distance and they are concatenated using the dot operator.
A similar mechanism was introduced in \cgal, with the small difference that the named parameters -tag live in the `CGAL::parameters::` namespace and `CGAL::parameters::use_default_values()` can be used to indicate +tag live in the `CGAL::parameters::` namespace and `CGAL::parameters::default_values()` can be used to indicate that default values of optional named parameters must be used. As in the \bgl, named parameters in \cgal are also concatenated using the dot operator, and a typical usage is thus: @@ -40,7 +40,7 @@ CGAL::copy_face_graph(g1, g2); CGAL::copy_face_graph(g1, g2, CGAL::parameters::vertex_point_map(vpm) //parameter for g1 .vertex_to_vertex_map(v2v), //other parameter for g1 - CGAL::parameters::use_default_values()); //parameter for g2 + CGAL::parameters::default_values()); //parameter for g2 \endcode */ diff --git a/BGL/doc/BGL/PackageDescription.txt b/BGL/doc/BGL/PackageDescription.txt index 16117666e7c..22d3836facb 100644 --- a/BGL/doc/BGL/PackageDescription.txt +++ b/BGL/doc/BGL/PackageDescription.txt @@ -683,7 +683,7 @@ user might encounter. - `CGAL::set_triangulation_ids()` -- `CGAL::parameters::use_default_values()` +- `CGAL::parameters::default_values()` \cgalCRPSection{Iterators} - `CGAL::Halfedge_around_source_iterator` diff --git a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h index 0fe138b4f44..f0bdc4fb9c1 100644 --- a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h +++ b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h @@ -149,7 +149,7 @@ struct Face_filtered_graph */ template Face_filtered_graph(const Graph& graph, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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)) diff --git a/BGL/include/CGAL/boost/graph/IO/GOCAD.h b/BGL/include/CGAL/boost/graph/IO/GOCAD.h index 0b6df5f1203..2e7af0193e5 100644 --- a/BGL/include/CGAL/boost/graph/IO/GOCAD.h +++ b/BGL/include/CGAL/boost/graph/IO/GOCAD.h @@ -112,7 +112,7 @@ template & name_and_color, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -134,7 +134,7 @@ 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::use_default_values(), +bool read_GOCAD(std::istream& is, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), typename boost::disable_if >::type* = nullptr) { std::pair dummy; @@ -186,7 +186,7 @@ template & name_and_color, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -200,7 +200,7 @@ 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::use_default_values(), +bool read_GOCAD(const std::string& fname, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), typename boost::disable_if >::type* = nullptr) { std::pair dummy; @@ -249,7 +249,7 @@ template >::type* = nullptr #endif @@ -345,7 +345,7 @@ template bool write_GOCAD(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -390,7 +390,7 @@ template bool write_GOCAD(const std::string& fname, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_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/Generic_facegraph_builder.h b/BGL/include/CGAL/boost/graph/IO/Generic_facegraph_builder.h index 9e445ff07a9..c5249e4db75 100644 --- a/BGL/include/CGAL/boost/graph/IO/Generic_facegraph_builder.h +++ b/BGL/include/CGAL/boost/graph/IO/Generic_facegraph_builder.h @@ -39,7 +39,7 @@ public: Generic_facegraph_builder(std::istream& in_) : m_is(in_) { } template - bool operator()(Graph& g, const NamedParameters& np = parameters::use_default_values()) + bool operator()(Graph& g, const NamedParameters& np = parameters::default_values()) { typedef typename GetK::Kernel Kernel; typedef typename Kernel::Vector_3 Vector; diff --git a/BGL/include/CGAL/boost/graph/IO/Generic_facegraph_printer.h b/BGL/include/CGAL/boost/graph/IO/Generic_facegraph_printer.h index 5931161c0e4..4774e6b693f 100644 --- a/BGL/include/CGAL/boost/graph/IO/Generic_facegraph_printer.h +++ b/BGL/include/CGAL/boost/graph/IO/Generic_facegraph_printer.h @@ -90,7 +90,7 @@ public: template bool operator()(const Graph& g, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetVertexPointMap::const_type VPM; typedef typename boost::property_traits::reference Point_ref; diff --git a/BGL/include/CGAL/boost/graph/IO/INP.h b/BGL/include/CGAL/boost/graph/IO/INP.h index 1a49bc6d0eb..229b696f830 100644 --- a/BGL/include/CGAL/boost/graph/IO/INP.h +++ b/BGL/include/CGAL/boost/graph/IO/INP.h @@ -32,7 +32,7 @@ bool write_INP(std::ostream& os, const std::string& name, const std::string& type, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -80,7 +80,7 @@ template bool write_INP(const std::string& fname, const std::string& type, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() ) + const CGAL_BGL_NP_CLASS& np = parameters::default_values() ) { std::ofstream os(fname); return write_INP(os, fname, type, g, np); @@ -92,7 +92,7 @@ CGAL_DEPRECATED bool write_inp(std::ostream& os, const FaceGraph& g, std::string name, std::string type, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { return write_INP(os, name, type, g, np); } diff --git a/BGL/include/CGAL/boost/graph/IO/OBJ.h b/BGL/include/CGAL/boost/graph/IO/OBJ.h index 2b22730ace7..85e9197be34 100644 --- a/BGL/include/CGAL/boost/graph/IO/OBJ.h +++ b/BGL/include/CGAL/boost/graph/IO/OBJ.h @@ -107,7 +107,7 @@ template bool read_OBJ(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -163,7 +163,7 @@ template bool read_OBJ(const std::string& fname, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -215,7 +215,7 @@ template bool write_OBJ(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -261,7 +261,7 @@ template bool write_OBJ(const std::string& fname, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_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 2ab0f9e0ab5..184ee592df4 100644 --- a/BGL/include/CGAL/boost/graph/IO/OFF.h +++ b/BGL/include/CGAL/boost/graph/IO/OFF.h @@ -153,7 +153,7 @@ template bool read_OFF(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -237,7 +237,7 @@ template bool read_OFF(const std::string& fname, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -257,7 +257,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool read_off(std::istream& is, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(is, g, np); } @@ -268,7 +268,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool read_off(const char* fname, Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(fname, g, np); } @@ -358,7 +358,7 @@ template bool write_OFF(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -432,7 +432,7 @@ template bool write_OFF(const std::string& fname, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -458,7 +458,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool write_off(std::ostream& os, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::write_OFF(os, g, np); } @@ -469,7 +469,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool write_off(const char* fname, const Graph& g, const CGAL_BGL_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 50fff6c4f07..75641130b13 100644 --- a/BGL/include/CGAL/boost/graph/IO/PLY.h +++ b/BGL/include/CGAL/boost/graph/IO/PLY.h @@ -61,7 +61,7 @@ public: template bool read_PLY_BGL(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef typename CGAL::GetVertexPointMap::type VPM; typedef typename boost::property_traits::value_type Point; @@ -134,7 +134,7 @@ template bool read_PLY(std::istream& is, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -209,7 +209,7 @@ template bool read_PLY(const std::string& fname, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -296,7 +296,7 @@ template bool write_PLY(std::ostream& os, const Graph& g, const std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -420,7 +420,7 @@ 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::use_default_values(), +bool write_PLY(std::ostream& os, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), typename boost::disable_if >::type* = nullptr) { return write_PLY(os, g, std::string(), np); @@ -492,7 +492,7 @@ template bool write_PLY(const std::string& fname, const Graph& g, const std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if >::type* = nullptr #endif @@ -517,7 +517,7 @@ 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::use_default_values(), +bool write_PLY(const std::string& fname, const Graph& g, const CGAL_BGL_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 3459917ad43..7a3f9038ccd 100644 --- a/BGL/include/CGAL/boost/graph/IO/STL.h +++ b/BGL/include/CGAL/boost/graph/IO/STL.h @@ -158,7 +158,7 @@ bool read_STL(std::istream& is, template bool read_STL(const std::string& fname, Graph& g, const - CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -230,7 +230,7 @@ bool read_STL(const std::string& fname, template bool write_STL(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -345,7 +345,7 @@ 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::use_default_values()) +bool write_STL(const std::string& fname, const Graph& g, const CGAL_BGL_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 5bd4985b905..fd4aa657afa 100644 --- a/BGL/include/CGAL/boost/graph/IO/VTK.h +++ b/BGL/include/CGAL/boost/graph/IO/VTK.h @@ -143,7 +143,7 @@ template bool read_VTP(const std::string& fname, Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::ifstream test(fname); if(!test.good()) @@ -415,7 +415,7 @@ void write_polys_points(std::ostream& os, template bool write_VTP(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; @@ -512,7 +512,7 @@ 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::use_default_values()) +bool write_VTP(const std::string& fname, const Graph& g, const CGAL_BGL_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; @@ -537,7 +537,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool write_vtp(std::ostream& os, const Graph& g, const CGAL_BGL_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 57688d1f586..f79e8b05d19 100644 --- a/BGL/include/CGAL/boost/graph/IO/WRL.h +++ b/BGL/include/CGAL/boost/graph/IO/WRL.h @@ -64,7 +64,7 @@ namespace IO { template bool write_WRL(std::ostream& os, const Graph& g, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { CGAL::VRML_2_ostream vos(os); internal::Generic_facegraph_printer printer(vos); @@ -103,7 +103,7 @@ 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::use_default_values()) +bool write_WRL(const std::string& fname, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::ofstream os(fname); return write_WRL(os, g, np); @@ -119,7 +119,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool write_wrl(std::ostream& os, const Graph& g, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::write_WRL(os, g, np); } diff --git a/BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h b/BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h index e903ca45557..6c156266172 100644 --- a/BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h +++ b/BGL/include/CGAL/boost/graph/IO/polygon_mesh_io.h @@ -39,7 +39,7 @@ namespace IO { template bool read_polygon_mesh(std::istream& is, Graph& g, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { bool ok = false; ok = read_OFF(is, g, np, false); @@ -122,7 +122,7 @@ bool read_polygon_mesh(std::istream& is, template bool read_polygon_mesh(const std::string& fname, Graph& g, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { const bool verbose = parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), false); @@ -215,7 +215,7 @@ bool read_polygon_mesh(const std::string& fname, template bool write_polygon_mesh(const std::string& fname, Graph& g, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { const bool verbose = parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), false); diff --git a/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h b/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h index 9d622e02fe4..72be6347a71 100644 --- a/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h +++ b/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h @@ -185,7 +185,7 @@ void partition_dual_graph(const TriangleMesh& tm, int nparts, /// \pre `tm` is a pure triangular surface mesh: there are no edges /// without at least one incident face template -void partition_dual_graph(const TriangleMesh& tm, int nparts, const NamedParameters& np = parameters::use_default_values()) +void partition_dual_graph(const TriangleMesh& tm, int nparts, const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; diff --git a/BGL/include/CGAL/boost/graph/METIS/partition_graph.h b/BGL/include/CGAL/boost/graph/METIS/partition_graph.h index 53efdc738b6..e1054f84837 100644 --- a/BGL/include/CGAL/boost/graph/METIS/partition_graph.h +++ b/BGL/include/CGAL/boost/graph/METIS/partition_graph.h @@ -218,7 +218,7 @@ void partition_graph(const TriangleMesh& tm, int nparts, /// \pre `tm` is a pure triangular surface mesh: there are no edges /// without at least one incident face template -void partition_graph(const TriangleMesh& tm, int nparts, const NamedParameters& np = parameters::use_default_values()) +void partition_graph(const TriangleMesh& tm, int nparts, const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; diff --git a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h b/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h index 20c4029d541..9b965550010 100644 --- a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h +++ b/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h @@ -513,7 +513,7 @@ double alpha_expansion_graphcut (const InputGraph& input_graph, EdgeCostMap edge_cost_map, VertexLabelCostMap vertex_label_cost_map, VertexLabelMap vertex_label_map, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/BGL/include/CGAL/boost/graph/copy_face_graph.h b/BGL/include/CGAL/boost/graph/copy_face_graph.h index d7e9cf17a0d..00e4a8b632c 100644 --- a/BGL/include/CGAL/boost/graph/copy_face_graph.h +++ b/BGL/include/CGAL/boost/graph/copy_face_graph.h @@ -355,8 +355,8 @@ template void copy_face_graph(const SourceMesh& sm, TargetMesh& tm, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values() + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values() ) { using parameters::choose_parameter; diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h index dfca1b1c9f3..aa1d46a55b3 100644 --- a/BGL/include/CGAL/boost/graph/named_params_helper.h +++ b/BGL/include/CGAL/boost/graph/named_params_helper.h @@ -224,7 +224,7 @@ typename BGL::internal::GetInitializedIndexMap, \ Graph, NamedParameters>::const_type \ get_initialized_##DTYPE##_index_map(const Graph& g, \ - const NamedParameters& np = parameters::use_default_values()) \ + const NamedParameters& np = parameters::default_values()) \ { \ typedef BGL::internal::GetInitializedIndexMap, \ Graph, NamedParameters>::type \ get_initialized_##DTYPE##_index_map(Graph& g, \ - const NamedParameters& np = parameters::use_default_values()) \ + const NamedParameters& np = parameters::default_values()) \ { \ typedef BGL::internal::GetInitializedIndexMap::face_descriptor g_face_descriptor; std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::use_default_values()); + PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::default_values()); Adapter fg(g, -1, boost::make_assoc_property_map(map)); assert(is_empty(fg)); diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h index d9173e47f95..59ffa07d654 100644 --- a/Convex_hull_3/include/CGAL/convex_hull_3.h +++ b/Convex_hull_3/include/CGAL/convex_hull_3.h @@ -1063,7 +1063,7 @@ void convex_hull_3(InputIterator first, InputIterator beyond, template void convex_hull_3(const VertexListGraph& g, PolygonMesh& pm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using CGAL::parameters::choose_parameter; using CGAL::parameters::get_parameter; diff --git a/Convex_hull_3/test/Convex_hull_3/test_ch_3_ambiguity.cpp b/Convex_hull_3/test/Convex_hull_3/test_ch_3_ambiguity.cpp index 30732869427..87588329136 100644 --- a/Convex_hull_3/test/Convex_hull_3/test_ch_3_ambiguity.cpp +++ b/Convex_hull_3/test/Convex_hull_3/test_ch_3_ambiguity.cpp @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) Surface_mesh chull; // compute convex hull - auto np = CGAL::parameters::use_default_values(); + auto np = CGAL::parameters::default_values(); CGAL::convex_hull_3(poly, chull, np); std::cout << "The convex hull contains " << chull.number_of_vertices() << " vertices" << std::endl; return 0; diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h index 99cf60b328a..e95ccf8fe1c 100644 --- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h +++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h @@ -315,7 +315,7 @@ template void oriented_bounding_box(const PointRange& points, Output& out, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if< typename boost::has_range_iterator @@ -416,7 +416,7 @@ template void oriented_bounding_box(const PolygonMesh& pmesh, Output& out, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::disable_if< typename boost::has_range_iterator 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 1b357f10e74..6079a73b085 100644 --- a/Point_set_3/include/CGAL/Point_set_3/IO.h +++ b/Point_set_3/include/CGAL/Point_set_3/IO.h @@ -121,7 +121,7 @@ namespace IO { template bool read_point_set(const std::string& fname, CGAL::Point_set_3& ps, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { const std::string ext = internal::get_file_extension(fname); @@ -214,7 +214,7 @@ namespace IO { template bool write_point_set(const std::string& fname, CGAL::Point_set_3& ps, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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 70ebe0e9253..07a7ad3d8d8 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 @@ -143,7 +143,7 @@ namespace IO { template bool write_OFF(std::ostream& os, const CGAL::Point_set_3& point_set, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { if(point_set.has_normal_map()) return Point_set_processing_3::internal::write_OFF_PSP(os, point_set, @@ -180,7 +180,7 @@ 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::use_default_values()) +bool write_OFF(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_BGL_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 2b09c4943b4..0c451d95d34 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 @@ -337,7 +337,7 @@ template & point_set, std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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) @@ -356,7 +356,7 @@ 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::use_default_values()) +bool read_PLY(const std::string& fname, CGAL::Point_set_3& point_set, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::string unused_comments; return read_PLY(fname, point_set, unused_comments, np); @@ -450,7 +450,7 @@ template & point_set, const std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef CGAL::Point_set_3 Point_set; typedef typename Point_set::Index Index; @@ -664,7 +664,7 @@ 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::use_default_values()) +bool write_PLY(std::ostream& os, const CGAL::Point_set_3& point_set, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return write_PLY(os, point_set, std::string(), np); } @@ -733,7 +733,7 @@ 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::use_default_values()) +bool write_PLY(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_BGL_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 8179ca8f6d2..d915feb7b4e 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 @@ -141,7 +141,7 @@ namespace IO { template bool write_XYZ(std::ostream& os, const CGAL::Point_set_3& point_set, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { if(point_set.has_normal_map()) return Point_set_processing_3::internal::write_XYZ_PSP(os, point_set, @@ -177,7 +177,7 @@ 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::use_default_values()) +bool write_XYZ(const std::string& fname, const CGAL::Point_set_3& point_set, const CGAL_BGL_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 a1d5130453d..a503168c6df 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 @@ -459,7 +459,7 @@ template bool read_LAS(std::istream& is, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -475,7 +475,7 @@ 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::use_default_values(), +bool read_LAS(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { return read_LAS::type>(is, output, np); @@ -523,7 +523,7 @@ template bool read_LAS(const std::string& filename, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::ifstream is(filename, std::ios::binary); CGAL::IO::set_mode(is, CGAL::IO::BINARY); @@ -533,7 +533,7 @@ 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::use_default_values()) +bool read_LAS(const std::string& fname, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::ifstream is(fname, std::ios::binary); CGAL::IO::set_mode(is, CGAL::IO::BINARY); @@ -613,7 +613,7 @@ template CGAL_DEPRECATED bool read_las_points(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -629,7 +629,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool read_las_points(std::istream& is, OutputIterator output, const CGAL_BGL_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 f0aafb103af..ed0bc982382 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 @@ -80,7 +80,7 @@ template bool read_OFF(std::istream& is, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = nullptr #endif @@ -242,7 +242,7 @@ template bool read_OFF(const std::string& fname, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = nullptr #endif @@ -257,14 +257,14 @@ 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::use_default_values(), +bool read_OFF(std::istream& is, OutputIterator output, const CGAL_BGL_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::use_default_values(), +bool read_OFF(const std::string& fname, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { std::ifstream is(fname); @@ -425,7 +425,7 @@ template CGAL_DEPRECATED bool read_off_points(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(is, output, np); } @@ -440,7 +440,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool read_off_points(std::istream& is, OutputIterator output, const CGAL_BGL_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 acbf2b50fe8..d6c19fee0a5 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 @@ -242,7 +242,7 @@ template bool read_PLY(std::istream& is, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = nullptr #endif @@ -324,7 +324,7 @@ template bool read_PLY(const std::string& fname, PointOutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = nullptr #endif @@ -349,14 +349,14 @@ bool read_PLY(const std::string& fname, // variants with default output iterator value type template -bool read_PLY(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::use_default_values(), +bool read_PLY(std::istream& is, OutputIterator output, const CGAL_BGL_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::use_default_values(), +bool read_PLY(const std::string& fname, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values(), typename std::enable_if::value>::type* = nullptr) { return read_PLY::type>(fname, output, np); @@ -459,7 +459,7 @@ CGAL_DEPRECATED bool read_ply_points_with_properties(std::istream& is, OutputIte \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::use_default_values()) +CGAL_DEPRECATED bool read_ply_points(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::read_PLY(is, output, np); } @@ -476,7 +476,7 @@ 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::use_default_values()) +CGAL_DEPRECATED bool read_ply_points(std::istream& is, OutputIterator output, const CGAL_BGL_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_points.h b/Point_set_processing_3/include/CGAL/IO/read_points.h index bd1e99a1ff8..b9ca990d21a 100644 --- a/Point_set_processing_3/include/CGAL/IO/read_points.h +++ b/Point_set_processing_3/include/CGAL/IO/read_points.h @@ -88,7 +88,7 @@ template bool read_points(const std::string& fname, PointOutputIterator output, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { const std::string ext = internal::get_file_extension(fname); @@ -110,7 +110,7 @@ bool read_points(const std::string& fname, // variant with default OutputIteratorType template -bool read_points(const std::string& fname, OutputIterator output, const NamedParameters& np = parameters::use_default_values()) +bool read_points(const std::string& fname, OutputIterator output, const NamedParameters& np = parameters::default_values()) { return read_points::type>(fname, 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 70e73575d33..71d458a6ec4 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 @@ -77,7 +77,7 @@ template bool read_XYZ(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -226,7 +226,7 @@ template bool read_XYZ(const std::string& fname, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::ifstream is(fname); return read_XYZ(is, output, np); @@ -236,14 +236,14 @@ bool read_XYZ(const std::string& fname, // variants with default output iterator value type template -bool read_XYZ(std::istream& is, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::use_default_values(), +bool read_XYZ(std::istream& is, OutputIterator output, const CGAL_BGL_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::use_default_values()) +bool read_XYZ(const std::string& fname, OutputIterator output, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::ifstream is(fname); return read_XYZ::type>(is, output, np); @@ -409,7 +409,7 @@ template CGAL_DEPRECATED bool read_xyz_points(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::read_XYZ(is, output, np); } @@ -419,7 +419,7 @@ template CGAL_DEPRECATED bool read_xyz_points(std::istream& is, OutputIterator output, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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 0ef63223a09..6f07afd945c 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 @@ -280,7 +280,7 @@ bool write_LAS_with_properties(std::ostream& os, ///< output stream. template bool write_LAS(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -335,7 +335,7 @@ bool write_LAS(std::ostream& os, template bool write_LAS(const std::string& filename, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -403,7 +403,7 @@ 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::use_default_values()) +bool write_las_points(std::ostream& os, const PointRange& points, const CGAL_BGL_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 354ec4c10ab..8e707fe251d 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 @@ -37,7 +37,7 @@ namespace internal { template bool write_OFF_PSP(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = CGAL::parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = CGAL::parameters::default_values()) { using CGAL::parameters::choose_parameter; using CGAL::parameters::get_parameter; @@ -133,7 +133,7 @@ namespace IO { template bool write_OFF(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -189,7 +189,7 @@ template bool write_OFF(const std::string& filename, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -302,7 +302,7 @@ bool write_off_points(std::ostream& os, ///< output stream. \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::use_default_values()) +CGAL_DEPRECATED bool write_off_points(std::ostream& os, const PointRange& points, const CGAL_BGL_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 c3bd1030045..f0d6dfd9e9d 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 @@ -187,7 +187,7 @@ template bool write_PLY(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -275,7 +275,7 @@ bool write_PLY(std::ostream& os, template bool write_PLY(const std::string& filename, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -375,7 +375,7 @@ CGAL_DEPRECATED bool write_ply_points_with_properties(std::ostream& os, ///< out \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::use_default_values()) +CGAL_DEPRECATED bool write_ply_points(std::ostream& os, const PointRange& points, const CGAL_BGL_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 80bb504b2ca..6bbeef5b11c 100644 --- a/Point_set_processing_3/include/CGAL/IO/write_points.h +++ b/Point_set_processing_3/include/CGAL/IO/write_points.h @@ -91,7 +91,7 @@ namespace IO { template bool write_points(const std::string& fname, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values(), + const CGAL_BGL_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 8c2fb1724ec..b8981a6ee0d 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 @@ -37,7 +37,7 @@ namespace internal { template bool write_XYZ_PSP(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = CGAL::parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = CGAL::parameters::default_values()) { using CGAL::parameters::choose_parameter; using CGAL::parameters::get_parameter; @@ -125,7 +125,7 @@ namespace IO { template bool write_XYZ(std::ostream& os, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -178,7 +178,7 @@ bool write_XYZ(std::ostream& os, template bool write_XYZ(const std::string& filename, const PointRange& points, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename boost::enable_if >::type* = nullptr #endif @@ -288,7 +288,7 @@ bool write_xyz_points(std::ostream& os, ///< output stream. \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::use_default_values()) +CGAL_DEPRECATED bool write_xyz_points(std::ostream& os, const PointRange& points, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::write_XYZ(os, points, np); } diff --git a/Point_set_processing_3/include/CGAL/OpenGR/compute_registration_transformation.h b/Point_set_processing_3/include/CGAL/OpenGR/compute_registration_transformation.h index 5dcaffc7518..7a439b3e0c9 100644 --- a/Point_set_processing_3/include/CGAL/OpenGR/compute_registration_transformation.h +++ b/Point_set_processing_3/include/CGAL/OpenGR/compute_registration_transformation.h @@ -296,8 +296,8 @@ std::pair #endif compute_registration_transformation (const PointRange1& point_set_1, const PointRange2& point_set_2, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { namespace GR = gr; using parameters::choose_parameter; diff --git a/Point_set_processing_3/include/CGAL/OpenGR/register_point_sets.h b/Point_set_processing_3/include/CGAL/OpenGR/register_point_sets.h index ce04510df45..345eaa650d2 100644 --- a/Point_set_processing_3/include/CGAL/OpenGR/register_point_sets.h +++ b/Point_set_processing_3/include/CGAL/OpenGR/register_point_sets.h @@ -210,8 +210,8 @@ template double register_point_sets (const PointRange1& point_set_1, PointRange2& point_set_2, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { namespace GR = gr; using parameters::choose_parameter; diff --git a/Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h b/Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h index 3536c9636ba..86fa5d23b19 100644 --- a/Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h +++ b/Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h @@ -263,7 +263,7 @@ double bilateral_smooth_point_set( PointRange& points, unsigned int k, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/cluster_point_set.h b/Point_set_processing_3/include/CGAL/cluster_point_set.h index a6730269888..a7c516a5e5f 100644 --- a/Point_set_processing_3/include/CGAL/cluster_point_set.h +++ b/Point_set_processing_3/include/CGAL/cluster_point_set.h @@ -131,7 +131,7 @@ CGAL::Emptyset_iterator get_adjacencies (const NamedParameters&, CGAL::Emptyset_ template std::size_t cluster_point_set (PointRange& points, ClusterMap cluster_map, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; 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 2a4e561a5e4..2699a1771ad 100644 --- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h +++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h @@ -155,7 +155,7 @@ template typename PointRange::iterator hierarchy_simplify_point_set (PointRange& points, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h index 96f0215ba19..da74d6e93ee 100644 --- a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h @@ -179,7 +179,7 @@ void jet_estimate_normals( PointRange& points, unsigned int k, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h index 45156f61936..50e8a9ad49d 100644 --- a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h +++ b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h @@ -188,7 +188,7 @@ void jet_smooth_point_set( PointRange& points, unsigned int k, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h index 25c319dba7a..5de84c761a5 100644 --- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h +++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h @@ -604,7 +604,7 @@ typename PointRange::iterator mst_orient_normals( PointRange& points, unsigned int k, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h index 00c34d29b1a..8447ae952ff 100644 --- a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h @@ -154,7 +154,7 @@ void pca_estimate_normals( PointRange& points, unsigned int k, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/pointmatcher/compute_registration_transformation.h b/Point_set_processing_3/include/CGAL/pointmatcher/compute_registration_transformation.h index 27f03515a70..56f70239750 100644 --- a/Point_set_processing_3/include/CGAL/pointmatcher/compute_registration_transformation.h +++ b/Point_set_processing_3/include/CGAL/pointmatcher/compute_registration_transformation.h @@ -592,8 +592,8 @@ std::pair #endif compute_registration_transformation (const PointRange1& point_set_1, const PointRange2& point_set_2, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/pointmatcher/register_point_sets.h b/Point_set_processing_3/include/CGAL/pointmatcher/register_point_sets.h index 231eef36e82..a20733c1ea5 100644 --- a/Point_set_processing_3/include/CGAL/pointmatcher/register_point_sets.h +++ b/Point_set_processing_3/include/CGAL/pointmatcher/register_point_sets.h @@ -229,8 +229,8 @@ template bool register_point_sets (const PointRange1& point_set_1, PointRange2& point_set_2, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { typedef typename Point_set_processing_3_np_helper::Geom_traits Kernel; diff --git a/Point_set_processing_3/include/CGAL/remove_outliers.h b/Point_set_processing_3/include/CGAL/remove_outliers.h index 2f1542a08f7..2b28e1e4c7b 100644 --- a/Point_set_processing_3/include/CGAL/remove_outliers.h +++ b/Point_set_processing_3/include/CGAL/remove_outliers.h @@ -176,7 +176,7 @@ typename PointRange::iterator remove_outliers( PointRange& points, unsigned int k, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/scanline_orient_normals.h b/Point_set_processing_3/include/CGAL/scanline_orient_normals.h index 4a8be33b868..02f956f2416 100644 --- a/Point_set_processing_3/include/CGAL/scanline_orient_normals.h +++ b/Point_set_processing_3/include/CGAL/scanline_orient_normals.h @@ -457,7 +457,7 @@ void orient_scanline (Iterator begin, Iterator end, \cgalNamedParamsEnd */ template -void scanline_orient_normals (PointRange& points, const NamedParameters& np = parameters::use_default_values()) +void scanline_orient_normals (PointRange& points, const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Point_set_processing_3/include/CGAL/vcm_estimate_normals.h b/Point_set_processing_3/include/CGAL/vcm_estimate_normals.h index b7aa5660c54..5b69f3ef0f9 100644 --- a/Point_set_processing_3/include/CGAL/vcm_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/vcm_estimate_normals.h @@ -263,7 +263,7 @@ compute_vcm (const PointRange& points, std::vector< std::array > &ccov, double offset_radius, double convolution_radius, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -430,7 +430,7 @@ void vcm_estimate_normals (PointRange& points, double offset_radius, double convolution_radius, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() ) { vcm_estimate_normals_internal(points, offset_radius, convolution_radius, np); @@ -489,7 +489,7 @@ void vcm_estimate_normals (PointRange& points, double offset_radius, unsigned int k, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() ) { vcm_estimate_normals_internal(points, offset_radius, 0, np, k); diff --git a/Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h b/Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h index 34fb35b208d..7e4b86cdebe 100644 --- a/Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h +++ b/Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h @@ -434,7 +434,7 @@ OutputIterator wlop_simplify_and_regularize_point_set( PointRange& points, OutputIterator output, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() ) { using parameters::choose_parameter; diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_difference_remeshed.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_difference_remeshed.cpp index f8e9f454975..b679f7bf5ae 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_difference_remeshed.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_difference_remeshed.cpp @@ -56,8 +56,8 @@ int main(int argc, char* argv[]) PMP::corefine_and_compute_difference(mesh1, mesh2, mesh1, - params::use_default_values(), // default parameters for mesh1 - params::use_default_values(), // default parameters for mesh2 + params::default_values(), // default parameters for mesh1 + params::default_values(), // default parameters for mesh2 params::edge_is_constrained_map(is_constrained_map)); if (valid_difference) diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_and_intersection.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_and_intersection.cpp index d4c04a4c8d1..8cf8216190c 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_and_intersection.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_mesh_union_and_intersection.cpp @@ -36,13 +36,13 @@ int main(int argc, char* argv[]) PMP::corefine_and_compute_boolean_operations( mesh1, mesh2, output, - params::use_default_values(), // mesh1 named parameters - params::use_default_values(), // mesh2 named parameters + params::default_values(), // mesh1 named parameters + params::default_values(), // mesh2 named parameters std::make_tuple( params::vertex_point_map(get(boost::vertex_point, out_union)), // named parameters for out_union params::vertex_point_map(get(boost::vertex_point, out_intersection)), // named parameters for out_intersection - params::use_default_values(), // named parameters for mesh1-mesh2 not used - params::use_default_values() )// named parameters for mesh2-mesh1 not used) + params::default_values(), // named parameters for mesh1-mesh2 not used + params::default_values() )// named parameters for mesh2-mesh1 not used) ); if (res[PMP::Corefinement::UNION]) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h index 03926175466..7435f6fcc64 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h @@ -87,7 +87,7 @@ namespace IO { template bool read_polygon_mesh(const std::string& fname, PolygonMesh& g, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { namespace PMP = CGAL::Polygon_mesh_processing; @@ -125,7 +125,7 @@ bool read_polygon_mesh(const std::string& fname, return false; } - PMP::polygon_soup_to_polygon_mesh(points, faces, g, parameters::use_default_values(), np); + PMP::polygon_soup_to_polygon_mesh(points, faces, g, parameters::default_values(), np); return true; } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h index 32f4083968e..21a1cab9a62 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h @@ -59,7 +59,7 @@ namespace CGAL { */ template CGAL::Bbox_3 bbox(const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using CGAL::parameters::choose_parameter; using CGAL::parameters::get_parameter; @@ -116,7 +116,7 @@ namespace CGAL { template CGAL::Bbox_3 vertex_bbox(typename boost::graph_traits::vertex_descriptor vd, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -165,7 +165,7 @@ namespace CGAL { template CGAL::Bbox_3 edge_bbox(typename boost::graph_traits::edge_descriptor ed, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -217,7 +217,7 @@ namespace CGAL { template CGAL::Bbox_3 face_bbox(typename boost::graph_traits::face_descriptor fd, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h index 6c3ba8770ee..c78b8b1f3fd 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h @@ -181,7 +181,7 @@ std::size_t border_size(typename boost::graph_traits::halfedge_desc HalfedgeOutputIterator border_halfedges(const FaceRange& face_range , const PolygonMesh& pmesh , HalfedgeOutputIterator out - , const NamedParameters& np = parameters::use_default_values()) + , const NamedParameters& np = parameters::default_values()) { if (face_range.empty()) return out; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h index 69ab66cb09c..8e6201696cb 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h @@ -600,8 +600,8 @@ template ::type::Plane_3& plane, #endif - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; @@ -717,7 +717,7 @@ bool clip(TriangleMesh& tm, bbox=CGAL::Bbox_3(bbox.xmin()-xd, bbox.ymin()-yd, bbox.zmin()-zd, bbox.xmax()+xd, bbox.ymax()+yd, bbox.zmax()+zd); TriangleMesh clipper; - Oriented_side os = internal::clip_to_bbox(plane, bbox, clipper, parameters::use_default_values()); + Oriented_side os = internal::clip_to_bbox(plane, bbox, clipper, parameters::default_values()); switch(os) { case ON_NEGATIVE_SIDE: @@ -803,7 +803,7 @@ bool clip(TriangleMesh& tm, #else const typename GetGeomTraits::type::Iso_cuboid_3& iso_cuboid, #endif - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; @@ -880,8 +880,8 @@ template void split(TriangleMesh& tm, TriangleMesh& splitter, - const NamedParameters1& np_tm = parameters::use_default_values(), - const NamedParameters2& np_s = parameters::use_default_values()) + const NamedParameters1& np_tm = parameters::default_values(), + const NamedParameters2& np_s = parameters::default_values()) { namespace PMP = CGAL::Polygon_mesh_processing; @@ -971,7 +971,7 @@ void split(TriangleMesh& tm, #else const typename GetGeomTraits::type::Plane_3& plane, #endif - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; @@ -987,7 +987,7 @@ void split(TriangleMesh& tm, bbox.xmax()+xd, bbox.ymax()+yd, bbox.zmax()+zd); TriangleMesh splitter; - CGAL::Oriented_side os = PMP::internal::clip_to_bbox(plane, bbox, splitter, CGAL::parameters::use_default_values()); + CGAL::Oriented_side os = PMP::internal::clip_to_bbox(plane, bbox, splitter, CGAL::parameters::default_values()); if(os == CGAL::ON_ORIENTED_BOUNDARY) { @@ -1074,7 +1074,7 @@ void split(TriangleMesh& tm, #else const typename GetGeomTraits::type::Iso_cuboid_3& iso_cuboid, #endif - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h index 426c16e01f4..c38f5eff3df 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h @@ -164,7 +164,7 @@ typename GetGeomTraits::type::Vector_3 #endif compute_face_normal(typename boost::graph_traits::face_descriptor f, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -225,7 +225,7 @@ compute_face_normal(typename boost::graph_traits::face_descriptor f template void compute_face_normals(const PolygonMesh& pmesh, Face_normal_map face_normals, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetGeomTraits::type Kernel; @@ -646,7 +646,7 @@ typename GetGeomTraits::type::Vector_3 #endif compute_vertex_normal(typename boost::graph_traits::vertex_descriptor v, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::is_default_parameter; @@ -759,7 +759,7 @@ compute_vertex_normal(typename boost::graph_traits::vertex_descript template void compute_vertex_normals(const PolygonMesh& pmesh, VertexNormalMap vertex_normals, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::is_default_parameter; @@ -856,7 +856,7 @@ template ::face_descriptor seed_face , const PolygonMesh& pmesh , FaceOutputIterator out - , const NamedParameters& np = parameters::use_default_values()) + , const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -200,7 +200,7 @@ template ::value_type connected_components(const PolygonMesh& pmesh, FaceComponentMap fcm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -261,7 +261,7 @@ template std::size_t number_of_connected_components(const PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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; @@ -380,7 +380,7 @@ template std::size_t keep_largest_connected_components(PolygonMesh& pmesh, std::size_t nb_components_to_keep, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef PolygonMesh PM; typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -527,7 +527,7 @@ template std::size_t keep_large_connected_components(PolygonMesh& pmesh, const ThresholdValueType threshold_value, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef PolygonMesh PM; typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -605,7 +605,7 @@ void keep_or_remove_connected_components(PolygonMesh& pmesh , const ComponentRange& components_to_keep , const FaceComponentMap& fcm , bool keep - , const NamedParameters& np = parameters::use_default_values()) + , const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -822,7 +822,7 @@ template void remove_connected_components(PolygonMesh& pmesh , const FaceRange& components_to_remove - , const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + , const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -944,7 +944,7 @@ template void keep_connected_components(PolygonMesh& pmesh , const FaceRange& components_to_keep - , const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + , const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef PolygonMesh PM; typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -1084,7 +1084,7 @@ void split_connected_components_impl(FIMap fim, template void split_connected_components(const PolygonMesh& pmesh, PolygonMeshRange& cc_meshes, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef Static_boolean_property_map< typename boost::graph_traits::edge_descriptor, false> Default_ecm; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h index f5a9ba9fc7f..79b16912735 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h @@ -186,8 +186,8 @@ corefine_and_compute_boolean_operations( TriangleMesh& tm1, TriangleMesh& tm2, const std::array< boost::optional,4>& output, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values(), + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values(), const std::tuple,4> output; @@ -528,9 +528,9 @@ corefine_and_compute_union( TriangleMesh& tm1, return corefine_and_compute_boolean_operations(tm1, tm2, output, np1, np2, std::make_tuple(np_out, - parameters::use_default_values(), - parameters::use_default_values(), - parameters::use_default_values())) + parameters::default_values(), + parameters::default_values(), + parameters::default_values())) [Corefinement::UNION]; } @@ -549,9 +549,9 @@ bool corefine_and_compute_intersection( TriangleMesh& tm1, TriangleMesh& tm2, TriangleMesh& tm_out, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values(), - const NamedParametersOut& np_out = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values(), + const NamedParametersOut& np_out = parameters::default_values()) { using namespace CGAL::parameters; std::array< boost::optional,4> output; @@ -559,10 +559,10 @@ corefine_and_compute_intersection( TriangleMesh& tm1, return corefine_and_compute_boolean_operations(tm1, tm2, output, np1, np2, - std::make_tuple(parameters::use_default_values(), + std::make_tuple(parameters::default_values(), np_out, - parameters::use_default_values(), - parameters::use_default_values())) + parameters::default_values(), + parameters::default_values())) [Corefinement::INTERSECTION]; } @@ -581,9 +581,9 @@ bool corefine_and_compute_difference( TriangleMesh& tm1, TriangleMesh& tm2, TriangleMesh& tm_out, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values(), - const NamedParametersOut& np_out = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values(), + const NamedParametersOut& np_out = parameters::default_values()) { using namespace CGAL::parameters; using namespace CGAL::Polygon_mesh_processing::Corefinement; @@ -592,10 +592,10 @@ corefine_and_compute_difference( TriangleMesh& tm1, return corefine_and_compute_boolean_operations(tm1, tm2, output, np1, np2, - std::make_tuple(parameters::use_default_values(), - parameters::use_default_values(), + std::make_tuple(parameters::default_values(), + parameters::default_values(), np_out, - parameters::use_default_values())) + parameters::default_values())) [TM1_MINUS_TM2]; } @@ -667,8 +667,8 @@ template void autorefine( TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -901,7 +901,7 @@ template bool autorefine_and_remove_self_intersections( TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/detect_features.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/detect_features.h index 3f014c0b21d..1a8610b9572 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/detect_features.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/detect_features.h @@ -149,7 +149,7 @@ typename boost::graph_traits::faces_size_type detect_surface_patches(const PolygonMesh& p, PatchIdMap patch_id_map, EdgeIsFeatureMap eif, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { int offset = static_cast( parameters::choose_parameter(parameters::get_parameter(np, internal_np::first_index), 1)); @@ -275,7 +275,7 @@ void detect_sharp_edges(const PolygonMesh& pmesh, typename GetGeomTraits::type::FT angle_in_deg, #endif EdgeIsFeatureMap edge_is_feature_map, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -453,7 +453,7 @@ sharp_edges_segmentation(const PolygonMesh& pmesh, #endif EdgeIsFeatureMap edge_is_feature_map, PatchIdMap patch_id_map, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { detect_sharp_edges(pmesh, angle_in_deg, edge_is_feature_map, np); diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h index ff50c84ee8a..791eaff09f7 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h @@ -856,7 +856,7 @@ template::type GeomTraits; typedef typename GetVertexPointMap::const_type Vpm; @@ -982,7 +982,7 @@ PointOutputIterator sample_triangle_soup(const PointRange& points, const TriangleRange& triangles, PointOutputIterator out, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename PointRange::value_type Point_3; typedef typename Kernel_traits::Kernel GeomTraits; @@ -1087,7 +1087,7 @@ double approximate_Hausdorff_distance( * \cgalParamNEnd * \cgalNamedParamsEnd * - * The function `CGAL::parameters::use_default_values()` can be used to indicate to use the default values + * The function `CGAL::parameters::default_values()` can be used to indicate to use the default values * for `np1` and specify custom values for `np2`. */ template< class Concurrency_tag, @@ -1096,8 +1096,8 @@ template< class Concurrency_tag, class NamedParameters2 = parameters::Default_named_parameters> double approximate_Hausdorff_distance( const TriangleMesh& tm1, const TriangleMesh& tm2, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { typedef typename GetGeomTraits::type GeomTraits; @@ -1120,8 +1120,8 @@ template< class Concurrency_tag, double approximate_symmetric_Hausdorff_distance( const TriangleMesh& tm1, const TriangleMesh& tm2, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { return (std::max)( approximate_Hausdorff_distance(tm1,tm2,np1,np2), @@ -1165,7 +1165,7 @@ template< class Concurrency_tag, class NamedParameters = parameters::Default_named_parameters> double max_distance_to_triangle_mesh(const PointRange& points, const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetGeomTraits::type GeomTraits; @@ -1214,7 +1214,7 @@ template< class TriangleMesh, double approximate_max_distance_to_point_set(const TriangleMesh& tm, const PointRange& points, const double precision, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetGeomTraits::type GeomTraits; @@ -2294,8 +2294,8 @@ double bounded_error_Hausdorff_distance( const TriangleMesh1& tm1, const TriangleMesh2& tm2, const double error_bound = 0.0001, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { CGAL_assertion_code( const bool is_triangle = is_triangle_mesh(tm1) && is_triangle_mesh(tm2)); @@ -2348,8 +2348,8 @@ double bounded_error_symmetric_Hausdorff_distance( const TriangleMesh1& tm1, const TriangleMesh2& tm2, const double error_bound, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { CGAL_assertion_code( const bool is_triangle = is_triangle_mesh(tm1) && is_triangle_mesh(tm2)); @@ -2418,8 +2418,8 @@ bool is_Hausdorff_distance_larger( const TriangleMesh2& tm2, const double distance_bound, const double error_bound, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { CGAL_assertion_code( const bool is_triangle = is_triangle_mesh(tm1) && is_triangle_mesh(tm2)); @@ -2478,8 +2478,8 @@ double bounded_error_Hausdorff_distance_naive( const TriangleMesh1& tm1, const TriangleMesh2& tm2, const double error_bound, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { CGAL_assertion_code( const bool is_triangle = is_triangle_mesh(tm1) && is_triangle_mesh(tm2)); 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 e30c6cad532..c10ddf77600 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h @@ -165,8 +165,8 @@ void extrude_mesh(const InputMesh& input, OutputMesh& output, const BottomFunctor& bot, const TopFunctor& top, - const CGAL_BGL_NP_CLASS_1& np_in = parameters::use_default_values(), - const CGAL_BGL_NP_CLASS_2& np_out = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS_1& np_in = parameters::default_values(), + const CGAL_BGL_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; @@ -285,8 +285,8 @@ void extrude_mesh(const InputMesh& input, #else typename GetGeomTraits::type::Vector_3 v, #endif - const CGAL_BGL_NP_CLASS_1& np_in = parameters::use_default_values(), - const CGAL_BGL_NP_CLASS_2& np_out = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS_1& np_in = parameters::default_values(), + const CGAL_BGL_NP_CLASS_2& np_out = parameters::default_values()) { typedef typename GetVertexPointMap < OutputMesh, CGAL_BGL_NP_CLASS_2>::type VPMap; VPMap output_vpm = parameters::choose_parameter(parameters::get_parameter(np_out, internal_np::vertex_point), diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h index 66c30b0c0f0..b7255e6c388 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h @@ -127,7 +127,7 @@ namespace internal { typename NamedParameters = parameters::Default_named_parameters> bool fair(TriangleMesh& tmesh, const VertexRange& vertices, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h index c4bdedaebbd..b3165acb327 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h @@ -47,7 +47,7 @@ void assign_tolerance_with_local_edge_length_bound(const HalfedgeRange& halfedge ToleranceMap& tolerance_map, const typename GetGeomTraits::type::FT tolerance, PolygonMesh& mesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; 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 454f1ee5515..8fc643a532c 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 @@ -1297,8 +1297,8 @@ std::size_t snap_borders(TriangleMesh& tm_A, ToleranceMap_A tolerance_map_A, TriangleMesh& tm_B, ToleranceMap_B tolerance_map_B, - const NamedParameters_A& np_A = parameters::use_default_values(), - const NamedParameters_B& np_B = parameters::use_default_values()) + const NamedParameters_A& np_A = parameters::default_values(), + const NamedParameters_B& np_B = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1318,8 +1318,8 @@ template std::size_t snap_borders(TriangleMesh& tm_A, TriangleMesh& tm_B, - const NamedParameters_A& np_A = parameters::use_default_values(), - const NamedParameters_B& np_B = parameters::use_default_values()) + const NamedParameters_A& np_A = parameters::default_values(), + const NamedParameters_B& np_B = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1355,7 +1355,7 @@ template std::size_t snap_borders(TriangleMesh& tm, ToleranceMap tolerance_map, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1371,7 +1371,7 @@ template std::size_t snap_borders(TriangleMesh& tm, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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 5d711d70ae5..004b4381771 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 @@ -1204,8 +1204,8 @@ std::size_t snap_vertices(const HalfedgeRange_A& halfedge_range_A, const HalfedgeRange_B& halfedge_range_B, PolygonMesh& tm_B, ToleranceMap_B tolerance_map_B, - const NamedParameters_A& np_A = parameters::use_default_values(), - const NamedParameters_B& np_B = parameters::use_default_values()) + const NamedParameters_A& np_A = parameters::default_values(), + const NamedParameters_B& np_B = parameters::default_values()) { CGAL::Emptyset_iterator unused_output_iterator; @@ -1224,8 +1224,8 @@ 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::use_default_values(), - const CGAL_BGL_NP_CLASS_2& np_B=parameters::use_default_values()) + const CGAL_BGL_NP_CLASS_1& np_A=parameters::default_values(), + const CGAL_BGL_NP_CLASS_2& np_B=parameters::default_values()) { typedef typename GetGeomTraits::type GT; typedef typename GT::FT FT; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/simplify_polyline.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/simplify_polyline.h index 84814be2455..016dedea22d 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/simplify_polyline.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/simplify_polyline.h @@ -33,8 +33,8 @@ template bool do_intersect(const TriangleMesh& tm1, const TriangleMesh& tm2, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values() + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values() #ifndef DOXYGEN_RUNNING , const typename boost::disable_if< typename boost::has_range_const_iterator::type @@ -1340,7 +1340,7 @@ template bool do_intersect(const TriangleMesh& tm, const PolylineRange& polylines, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , const typename boost::enable_if< typename boost::has_range_iterator< @@ -1405,7 +1405,7 @@ template bool do_intersect(const TriangleMesh& tm, const Polyline& polyline, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , const typename boost::disable_if< typename boost::has_range_iterator< @@ -1642,7 +1642,7 @@ OutputIterator intersecting_meshes(const TriangleMeshRange& range, const NamedParameters& np) { std::vector nps( - std::distance(range.begin(), range.end()), parameters::use_default_values()); + std::distance(range.begin(), range.end()), parameters::default_values()); return intersecting_meshes(range, out, np, nps); } @@ -1650,7 +1650,7 @@ template OutputIterator intersecting_meshes(const TriangleMeshRange& range, OutputIterator out) { - return intersecting_meshes(range, out, parameters::use_default_values()); + return intersecting_meshes(range, out, parameters::default_values()); } /** @@ -1705,8 +1705,8 @@ OutputIterator surface_intersection(const TriangleMesh& tm1, const TriangleMesh& tm2, OutputIterator polyline_output, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { const bool throw_on_self_intersection = parameters::choose_parameter(parameters::get_parameter(np1, internal_np::throw_on_self_intersection), false); @@ -1766,7 +1766,7 @@ template ::const_type VPM; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h index e28d937ac08..1d1033a41b2 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h @@ -596,7 +596,7 @@ construct_point(const std::pair::face std::array >& loc, #endif const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename GetGeomTraits::type Geom_traits; @@ -1107,7 +1107,7 @@ locate_in_face(const typename internal::Location_traits::face_descriptor fd, const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; @@ -1577,7 +1577,7 @@ build_AABB_tree(const TriangleMesh& tm, typename GetGeomTraits::type, #endif CGAL::AABB_face_graph_triangle_primitive > >& outTree, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetVertexPointMap::const_type VertexPointMap; @@ -1654,7 +1654,7 @@ locate_with_AABB_tree(const typename internal::Location_traits > >& tree, #endif const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename internal::Location_traits::Point Point; typedef internal::Point_to_Point_3 P_to_P3; @@ -1738,7 +1738,7 @@ typename internal::Location_traits::Face_location locate(const typename internal::Location_traits::Point& p, #endif const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { // Wrap the input VPM with a one converting to 3D (costs nothing if the input VPM // already has value type Kernel::Point_3) @@ -1831,7 +1831,7 @@ locate_with_AABB_tree(const typename internal::Location_traits >& tree, #endif const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetGeomTraits::type Geom_traits; @@ -1956,7 +1956,7 @@ typename internal::Location_traits::Face_location locate(const typename internal::Location_traits::Ray& ray, #endif const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetVertexPointMap::const_type VertexPointMap; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h index 2ff651d3a76..0dd4050e057 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h @@ -429,7 +429,7 @@ OutputIterator non_manifold_vertices(const PolygonMesh& pm, /// \return the number of vertices created. template std::size_t duplicate_non_manifold_vertices(PolygonMesh& pm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; 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 2f8ac1c15f7..7651a1a944e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h @@ -105,7 +105,7 @@ typename GetGeomTraits::type::FT #endif edge_length(typename boost::graph_traits::halfedge_descriptor h, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetGeomTraits::type Geom_traits; @@ -130,7 +130,7 @@ template::type::FT edge_length(typename boost::graph_traits::edge_descriptor e, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { return edge_length(halfedge(e, pmesh), pmesh, np); } @@ -180,7 +180,7 @@ typename GetGeomTraits::type::FT #endif squared_edge_length(typename boost::graph_traits::halfedge_descriptor h, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetGeomTraits::type Geom_traits; @@ -206,7 +206,7 @@ template::type::FT squared_edge_length(typename boost::graph_traits::edge_descriptor e, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { return squared_edge_length(halfedge(e, pmesh), pmesh, np); } @@ -260,7 +260,7 @@ typename GetGeomTraits::type::FT #endif face_border_length(typename boost::graph_traits::halfedge_descriptor h, const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typename GetGeomTraits::type::FT result = 0; @@ -320,7 +320,7 @@ std::pair::halfedge_descriptor, typename GetGeomTraits::type::FT> #endif longest_border(const PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename CGAL::Kernel_traits< typename property_map_value::type>::Kernel::FT FT; @@ -405,7 +405,7 @@ typename GetGeomTraits::type::FT #endif face_area(typename boost::graph_traits::face_descriptor f, const TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -477,7 +477,7 @@ 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::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -554,7 +554,7 @@ typename GetGeomTraits::type::FT #endif area(FaceRange face_range, const TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::face_descriptor face_descriptor; @@ -613,7 +613,7 @@ FT #else typename GetGeomTraits::type::FT #endif -area(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) +area(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return area(faces(tmesh), tmesh, np); } @@ -661,7 +661,7 @@ FT typename GetGeomTraits::type::FT #endif volume(const TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { CGAL_assertion(is_triangle_mesh(tmesh)); CGAL_assertion(is_closed(tmesh)); @@ -735,7 +735,7 @@ 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::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { CGAL_precondition(is_triangle(f, tmesh)); @@ -839,7 +839,7 @@ Point_3 #else typename GetGeomTraits::type::Point_3 #endif -centroid(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) +centroid(const TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { // See: http://www2.imperial.ac.uk/~rn/centroid.pdf @@ -960,8 +960,8 @@ template< typename PolygonMesh1, typename NamedParameters2 = parameters::Default_named_parameters > void match_faces(const PolygonMesh1& m1, const PolygonMesh2& m2, FacePairOutputIterator common, FaceOutputIterator1 m1_only, FaceOutputIterator2 m2_only, - const NamedParameters1& np1 = parameters::use_default_values(), - const NamedParameters2& np2 = parameters::use_default_values()) + const NamedParameters1& np1 = parameters::default_values(), + const NamedParameters2& np2 = parameters::default_values()) { typedef typename GetVertexPointMap::const_type VPMap1; typedef typename GetVertexPointMap::const_type VPMap2; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h index 7147690801b..d188195b104 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h @@ -281,7 +281,7 @@ template ::halfedge_descriptor h, PolygonMesh& pm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename GetVertexPointMap::const_type Vpm; @@ -335,7 +335,7 @@ void merge_duplicated_vertices_in_boundary_cycle( /// \sa `merge_duplicated_vertices_in_boundary_cycle()` template void merge_duplicated_vertices_in_boundary_cycles( PolygonMesh& pm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h index 15b0b301046..4621879ee1d 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h @@ -525,7 +525,7 @@ struct Polygon_soup_orienter template bool orient_polygon_soup(PointRange& points, PolygonRange& polygons, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup_extension.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup_extension.h index 039ed20290a..98e3e45af81 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup_extension.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup_extension.h @@ -124,7 +124,7 @@ orient_triangle_soup_with_reference_triangle_mesh( const TriangleMesh& tm_ref, PointRange& points, TriangleRange& triangles, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { namespace PMP = CGAL::Polygon_mesh_processing; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h index 3acfe2c5fc1..86c69689fb4 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h @@ -183,7 +183,7 @@ namespace internal{ */ template bool is_outward_oriented(const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { CGAL_warning(CGAL::is_closed(tm)); CGAL_warning(CGAL::is_triangle_mesh(tm)); @@ -396,7 +396,7 @@ void reverse_face_orientations(const FaceRange& face_range, PolygonMesh& pmesh) */ template void orient(TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef boost::graph_traits Graph_traits; typedef typename Graph_traits::vertex_descriptor vertex_descriptor; @@ -798,7 +798,7 @@ template -bool does_bound_a_volume(const TriangleMesh& tm, const NamedParameters& np = parameters::use_default_values()) +bool does_bound_a_volume(const TriangleMesh& tm, const NamedParameters& np = parameters::default_values()) { typedef boost::graph_traits GT; typedef typename GT::face_descriptor face_descriptor; @@ -1319,7 +1319,7 @@ bool does_bound_a_volume(const TriangleMesh& tm, const NamedParameters& np = par */ template void orient_to_bound_a_volume(TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef boost::graph_traits Graph_traits; typedef typename Graph_traits::face_descriptor face_descriptor; @@ -1424,7 +1424,7 @@ void orient_to_bound_a_volume(TriangleMesh& tm, */ template void merge_reversible_connected_components(PolygonMesh& pm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef boost::graph_traits GrT; typedef typename GrT::face_descriptor face_descriptor; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h index 57809bbfb32..e696929a250 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h @@ -72,7 +72,7 @@ template::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h index 76f677ca4fd..8aea03c4e96 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h @@ -273,8 +273,8 @@ template void random_perturbation(TriangleMesh& tmesh , const double& perturbation_max_size - , const NamedParameters& np = parameters::use_default_values()) + , const NamedParameters& np = parameters::default_values()) { random_perturbation(vertices(tmesh), tmesh, perturbation_max_size, np); } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h index 36b0994be59..03bdf356a37 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h @@ -78,7 +78,7 @@ namespace Polygon_mesh_processing { const FaceRange& faces, FaceOutputIterator faces_out, VertexOutputIterator vertices_out, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h index 2a533194690..325700cc70e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h @@ -196,7 +196,7 @@ template::edge_descriptor edge_descriptor; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h index ba3f72c7396..72ce4a5f3cf 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h @@ -150,7 +150,7 @@ std::size_t remove_isolated_vertices(PolygonMesh& pmesh) template std::size_t remove_connected_components_of_negligible_size(TriangleMesh& tmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::is_default_parameter; 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 d2352b30dd7..386f789995b 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 @@ -535,7 +535,7 @@ bool remove_almost_degenerate_faces(const FaceRange& face_range, const double cap_threshold, const double needle_threshold, const double collapse_length_threshold, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using CGAL::parameters::choose_parameter; using CGAL::parameters::get_parameter; @@ -913,7 +913,7 @@ 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::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return remove_almost_degenerate_faces(faces(tmesh), tmesh, cap_threshold, needle_threshold, collapse_length_threshold, np); @@ -1206,7 +1206,7 @@ template bool remove_degenerate_edges(const EdgeRange& edge_range, TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::set::face_descriptor> face_set; return remove_degenerate_edges(edge_range, tmesh, face_set, np); @@ -1716,7 +1716,7 @@ bool remove_degenerate_edges(const EdgeRange& edge_range, template bool remove_degenerate_edges(TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::set::face_descriptor> face_set; return remove_degenerate_edges(edges(tmesh), tmesh, face_set, np); @@ -1766,7 +1766,7 @@ bool remove_degenerate_edges(TriangleMesh& tmesh, template bool remove_degenerate_faces(const FaceRange& face_range, TriangleMesh& tmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { CGAL_assertion(CGAL::is_triangle_mesh(tmesh)); CGAL_assertion(CGAL::is_valid_polygon_mesh(tmesh)); @@ -2581,7 +2581,7 @@ bool remove_degenerate_faces(const FaceRange& face_range, template bool remove_degenerate_faces(TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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_polygon_soup.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h index 93b4be77c97..3f71c5fb183 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h @@ -477,7 +477,7 @@ std::size_t remove_isolated_points_in_polygon_soup(PointRange& points, template std::size_t merge_duplicate_points_in_polygon_soup(PointRange& points, PolygonRange& polygons, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename internal::Polygon_types::P_ID P_ID; typedef typename internal::Polygon_types::Point_3 Point_3; @@ -876,7 +876,7 @@ DuplicateOutputIterator collect_duplicate_polygons(const PointRange& points, template std::size_t merge_duplicate_polygons_in_polygon_soup(const PointRange& points, PolygonRange& polygons, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; @@ -1032,7 +1032,7 @@ std::size_t merge_duplicate_polygons_in_polygon_soup(const PointRange& points, template void repair_polygon_soup(PointRange& points, PolygonRange& polygons, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; 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 4341137fae5..042ae75c4f8 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 @@ -1959,7 +1959,7 @@ struct Remove_self_intersection_default_visitor template bool remove_self_intersections(const FaceRange& face_range, TriangleMesh& tmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -2105,7 +2105,7 @@ bool remove_self_intersections(const FaceRange& face_range, } template -bool remove_self_intersections(TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) +bool remove_self_intersections(TriangleMesh& tmesh, const CGAL_BGL_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 6d1e7c1eb51..1c28b4ff67b 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 @@ -461,7 +461,7 @@ FacePairOutputIterator self_intersections(const FaceRange& face_range, const TriangleMesh& tmesh, FacePairOutputIterator out, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { return internal::self_intersections_impl(face_range, tmesh, out, false /*don't throw*/, np); } @@ -524,7 +524,7 @@ template (faces(tmesh), tmesh, out, np); } @@ -570,7 +570,7 @@ template bool does_self_intersect(const FaceRange& face_range, const TriangleMesh& tmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { CGAL_precondition(CGAL::is_triangle_mesh(tmesh)); @@ -634,7 +634,7 @@ template bool does_self_intersect(const TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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 907e90cdab1..05d03dd599a 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 @@ -69,7 +69,7 @@ namespace Polygon_mesh_processing { template bool is_degenerate_edge(typename boost::graph_traits::edge_descriptor e, const PolygonMesh& pm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; @@ -118,7 +118,7 @@ template ::edge_descriptor edge_descriptor; @@ -137,7 +137,7 @@ OutputIterator degenerate_edges(const EdgeRange& edges, template OutputIterator degenerate_edges(const TriangleMesh& tm, OutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() ) { return degenerate_edges(edges(tm), tm, out, np); @@ -177,7 +177,7 @@ OutputIterator degenerate_edges(const TriangleMesh& tm, template bool is_degenerate_triangle_face(typename boost::graph_traits::face_descriptor f, const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { CGAL_precondition(CGAL::is_triangle(halfedge(f, tm), tm)); @@ -233,7 +233,7 @@ template ::face_descriptor face_descriptor; @@ -253,7 +253,7 @@ OutputIterator degenerate_faces(const FaceRange& faces, template OutputIterator degenerate_faces(const TriangleMesh& tm, OutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() ) { return degenerate_faces(faces(tm), tm, out, np); @@ -295,7 +295,7 @@ typename boost::graph_traits::halfedge_descriptor is_needle_triangle_face(typename boost::graph_traits::face_descriptor f, const TriangleMesh& tm, const double threshold, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { CGAL_precondition(threshold >= 1.); CGAL_precondition(f != boost::graph_traits::null_face()); @@ -393,7 +393,7 @@ typename boost::graph_traits::halfedge_descriptor is_cap_triangle_face(typename boost::graph_traits::face_descriptor f, const TriangleMesh& tm, const double threshold, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { CGAL_precondition(f != boost::graph_traits::null_face()); CGAL_precondition(CGAL::is_triangle(halfedge(f, tm), tm)); 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 ebaa55fb957..dc20d5b409c 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 @@ -132,7 +132,7 @@ namespace Polygon_mesh_processing { template void smooth_mesh(const FaceRange& faces, TriangleMesh& tmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -325,7 +325,7 @@ void smooth_mesh(const FaceRange& faces, ///\cond SKIP_IN_MANUAL template -void smooth_mesh(TriangleMesh& tmesh, const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) +void smooth_mesh(TriangleMesh& tmesh, const CGAL_BGL_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 4f59172e541..9267bceea4e 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 @@ -99,7 +99,7 @@ template void smooth_shape(TriangleMesh& tmesh, const double time, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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 1a3a0f9788a..13870aadfb8 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 @@ -1117,7 +1117,7 @@ std::size_t stitch_boundary_cycle(const typename boost::graph_traits std::size_t stitch_boundary_cycle(const typename boost::graph_traits::halfedge_descriptor h, PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { internal::Dummy_cycle_rep_maintainer dummy_maintainer(pmesh); return internal::stitch_boundary_cycle(h, pmesh, dummy_maintainer, np); @@ -1178,7 +1178,7 @@ std::size_t stitch_boundary_cycles(const BorderHalfedgeRange& boundary_cycle_rep template std::size_t stitch_boundary_cycles(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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 @@ -1191,7 +1191,7 @@ std::size_t stitch_boundary_cycles(const BorderHalfedgeRange& boundary_cycle_rep // convenience overloads template std::size_t stitch_boundary_cycles(PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1245,7 +1245,7 @@ template std::size_t stitch_borders(PolygonMesh& pmesh, const HalfedgePairsRange& hedge_pairs_to_stitch, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values(), + const CGAL_BGL_NP_CLASS& np = parameters::default_values(), typename boost::enable_if< typename boost::has_range_iterator >::type* = 0) @@ -1376,7 +1376,7 @@ std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representat /// template std::size_t stitch_borders(PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1438,7 +1438,7 @@ std::size_t stitch_borders(PolygonMesh& pmesh, template std::size_t stitch_borders(const BorderHalfedgeRange& boundary_cycle_representatives, PolygonMesh& pmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_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/transform.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/transform.h index 560e40ce9ef..606db68b196 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/transform.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/transform.h @@ -47,7 +47,7 @@ namespace Polygon_mesh_processing{ template void transform(const Transformation& transformation, PolygonMesh& mesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename GetVertexPointMap::type VPMap; VPMap vpm = parameters::choose_parameter(parameters::get_parameter(np, internal_np::vertex_point), diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h index e46d39db647..f34f5d52049 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h @@ -465,7 +465,7 @@ public: template bool triangulate_face(typename boost::graph_traits::face_descriptor f, PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -542,7 +542,7 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor template bool triangulate_faces(FaceRange face_range, PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -613,7 +613,7 @@ bool triangulate_faces(FaceRange face_range, */ template bool triangulate_faces(PolygonMesh& pmesh, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { return triangulate_faces(faces(pmesh), pmesh, np); } 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 8d3a70f54c0..714b1c7805f 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 @@ -120,7 +120,7 @@ namespace Polygon_mesh_processing { triangulate_hole(PolygonMesh& pmesh, typename boost::graph_traits::halfedge_descriptor border_halfedge, OutputIterator out, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -279,7 +279,7 @@ namespace Polygon_mesh_processing { typename boost::graph_traits::halfedge_descriptor border_halfedge, FaceOutputIterator face_out, VertexOutputIterator vertex_out, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { std::vector::face_descriptor> patch; triangulate_hole(pmesh, border_halfedge, std::back_inserter(patch), np); @@ -399,7 +399,7 @@ namespace Polygon_mesh_processing { typename boost::graph_traits::halfedge_descriptor border_halfedge, FaceOutputIterator face_out, VertexOutputIterator vertex_out, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { std::vector::vertex_descriptor> patch; @@ -498,7 +498,7 @@ namespace Polygon_mesh_processing { triangulate_hole_polyline(const PointRange1& points, const PointRange2& third_points, OutputIterator out, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { if (points.empty()) return out; @@ -583,7 +583,7 @@ bool use_dt3 = OutputIterator triangulate_hole_polyline(const PointRange& points, OutputIterator out, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_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 71c7a9c0c98..af1a8ea8d67 100644 --- a/Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h +++ b/Polygon_mesh_processing/include/CGAL/Polyhedral_envelope.h @@ -362,7 +362,7 @@ public: template Polyhedral_envelope(const TriangleMesh& tmesh, double epsilon, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -463,7 +463,7 @@ public: Polyhedral_envelope(const FaceRange& face_range, const TriangleMesh& tmesh, double epsilon, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = 0 #endif @@ -567,7 +567,7 @@ public: Polyhedral_envelope(const PointRange& points, const TriangleRange& triangles, double epsilon, - const NamedParameters& np = parameters::use_default_values() + const NamedParameters& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = 0 #endif @@ -2223,7 +2223,7 @@ public: template bool operator()(const TriangleMesh& tmesh, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values() + const CGAL_BGL_NP_CLASS& np = parameters::default_values() #ifndef DOXYGEN_RUNNING , typename std::enable_if::value>::type* = 0 #endif @@ -2278,7 +2278,7 @@ public: template bool operator()(const PointRange& points, const TriangleRange& triangles, - const NamedParameters& np = parameters::use_default_values()) const + const NamedParameters& np = parameters::default_values()) const { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Polygon_mesh_processing/include/CGAL/Rigid_triangle_mesh_collision_detection.h b/Polygon_mesh_processing/include/CGAL/Rigid_triangle_mesh_collision_detection.h index f387376104b..7b28b5d4121 100644 --- a/Polygon_mesh_processing/include/CGAL/Rigid_triangle_mesh_collision_detection.h +++ b/Polygon_mesh_processing/include/CGAL/Rigid_triangle_mesh_collision_detection.h @@ -242,7 +242,7 @@ public: */ template std::size_t add_mesh(const TriangleMesh& tm, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { // handle vpm typedef typename CGAL::GetVertexPointMap::const_type Local_vpm; @@ -300,7 +300,7 @@ public: * \cgalNamedParamsEnd */ template - std::size_t add_mesh(const AABB_tree& tree, const TriangleMesh& tm, const NamedParameters& np = parameters::use_default_values()) + std::size_t add_mesh(const AABB_tree& tree, const TriangleMesh& tm, const NamedParameters& np = parameters::default_values()) { std::size_t id = get_id_for_new_mesh(); CGAL_assertion( m_aabb_trees[id] == nullptr ); @@ -551,7 +551,7 @@ public: void collect_one_point_per_connected_component( const TriangleMesh& tm, std::vector& points, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { const bool maybe_several_cc = parameters::choose_parameter( diff --git a/Polygon_mesh_processing/include/CGAL/polygon_mesh_processing.h b/Polygon_mesh_processing/include/CGAL/polygon_mesh_processing.h index ecea741611f..4eec2ff467f 100644 --- a/Polygon_mesh_processing/include/CGAL/polygon_mesh_processing.h +++ b/Polygon_mesh_processing/include/CGAL/polygon_mesh_processing.h @@ -57,7 +57,7 @@ namespace Polygon_mesh_processing { namespace parameters { /*! \ingroup namedparameters -\deprecated This function is deprecated and `use_default_values()` should be used instead. +\deprecated This function is deprecated and `default_values()` should be used instead. This function can be used to indicate that all optional named parameters to be used are the default ones. This is particularly useful when a function requires more than one sequence of named parameters and default values is diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp index 1a65ac0a47f..3050a34753f 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp @@ -243,7 +243,7 @@ void test_compare() return; } input.close(); - PMP::match_faces(mesh1, mesh2, std::back_inserter(common), std::back_inserter(m1_only), std::back_inserter(m2_only), CGAL::parameters::use_default_values(), CGAL::parameters::use_default_values()); + PMP::match_faces(mesh1, mesh2, std::back_inserter(common), std::back_inserter(m1_only), std::back_inserter(m2_only), CGAL::parameters::default_values(), CGAL::parameters::default_values()); assert(common.size() == 7); assert(m1_only.size() == 11); assert(m2_only.size() == 11); @@ -283,7 +283,7 @@ void test_compare() { fim2.insert(std::make_pair(f, id++)); } - PMP::match_faces(mesh1, mesh2, std::back_inserter(common), std::back_inserter(m1_only), std::back_inserter(m2_only), CGAL::parameters::use_default_values(), CGAL::parameters::use_default_values()); + PMP::match_faces(mesh1, mesh2, std::back_inserter(common), std::back_inserter(m1_only), std::back_inserter(m2_only), CGAL::parameters::default_values(), CGAL::parameters::default_values()); assert(common.size() == 3); assert(m1_only.size() == 3); assert(fim1[m1_only[0]] == 0); @@ -317,7 +317,7 @@ void test_compare() return; } input.close(); - PMP::match_faces(mesh1, mesh2, std::back_inserter(common), std::back_inserter(m1_only), std::back_inserter(m2_only), CGAL::parameters::use_default_values(), CGAL::parameters::use_default_values()); + PMP::match_faces(mesh1, mesh2, std::back_inserter(common), std::back_inserter(m1_only), std::back_inserter(m2_only), CGAL::parameters::default_values(), CGAL::parameters::default_values()); assert(common.size() == 17); assert(m1_only.size() == 1); assert(m2_only.size() == 0); diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp index b2f8076a9dc..93bdd0fbd01 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp @@ -92,8 +92,8 @@ test_faces_intersections(const std::string filename1, CGAL::Polygon_mesh_processing::internal::compute_face_face_intersection( m1, m2, std::back_inserter(intersected_tris), - CGAL::parameters::use_default_values(), - CGAL::parameters::use_default_values()); + CGAL::parameters::default_values(), + CGAL::parameters::default_values()); bool intersecting_1 = !intersected_tris.empty(); @@ -150,7 +150,7 @@ test_faces_polyline_intersections(const std::string filename1, CGAL::Polygon_mesh_processing::internal::compute_face_polyline_intersection( m, points, std::back_inserter(intersected_tris), - CGAL::parameters::use_default_values()); + CGAL::parameters::default_values()); bool intersecting_1 = !intersected_tris.empty(); @@ -211,7 +211,7 @@ test_faces_polylines_intersections(const std::string filename1, points, m, std::back_inserter(intersected_tris), - CGAL::parameters::use_default_values()); + CGAL::parameters::default_values()); bool intersecting_1 = !intersected_tris.empty(); diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp index 7dc20fba311..ae913ff8f5a 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp @@ -95,7 +95,7 @@ int main() volume = sm1; volume_copy = volume; PMP::orient(sm1); - if(!test_orientation(sm1, true, CGAL::parameters::use_default_values())) + if(!test_orientation(sm1, true, CGAL::parameters::default_values())) return 1; typedef boost::property_map::type Ppmap; typedef boost::property_map::type Fidmap; @@ -112,7 +112,7 @@ int main() } PMP::orient(sm3, CGAL::parameters::outward_orientation(false)); - if(!test_orientation(sm3, false, CGAL::parameters::use_default_values())) + if(!test_orientation(sm3, false, CGAL::parameters::default_values())) { std::cerr << "ERROR for test2\n"; return 1; diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp index 365e1d781ba..c564403312a 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp @@ -63,7 +63,7 @@ void test() params::throw_on_self_intersection(true), params::do_not_modify(true)); std::vector meshes; - PMP::split_connected_components(tm1, meshes, params::use_default_values()); + PMP::split_connected_components(tm1, meshes, params::default_values()); assert(meshes.size() == 2); //if the order is not deterministc, put the num_vertices in a list and check //if the list does contain all those numbers. @@ -576,7 +576,7 @@ void test_split_plane() PMP::split(tm1,K::Plane_3(0,0,1,0)); std::vector meshes; - PMP::split_connected_components(tm1, meshes, params::use_default_values()); + PMP::split_connected_components(tm1, meshes, params::default_values()); assert(meshes.size() == 3); //if the order is not deterministc, put the num_vertices in a list and check //if the list does contain all those numbers. @@ -600,7 +600,7 @@ void test_split_plane() input.close(); PMP::split(tm1,K::Plane_3(0,0,1,-1)); - PMP::split_connected_components(tm1, meshes, params::use_default_values()); + PMP::split_connected_components(tm1, meshes, params::default_values()); assert(meshes.size() == 281); CGAL::clear(tm1); @@ -619,7 +619,7 @@ void test_split_plane() input.close(); PMP::split(tm1,K::Plane_3(0,-1,0,0.3)); - PMP::split_connected_components(tm1, meshes, params::use_default_values()); + PMP::split_connected_components(tm1, meshes, params::default_values()); assert(meshes.size() == 2); CGAL::clear(tm1); @@ -637,7 +637,7 @@ void test_split_plane() PMP::split(tm1, K::Plane_3(0,0,1,-0.5), params::throw_on_self_intersection(true) .allow_self_intersections(true)); - PMP::split_connected_components(tm1, meshes, params::use_default_values()); + PMP::split_connected_components(tm1, meshes, params::default_values()); assert(meshes.size() == 2); //if the order is not deterministc, put the num_vertices in a list and check //if the list does contain all those numbers. @@ -687,7 +687,7 @@ void test_split() TriangleMesh, CGAL::dynamic_face_property_t >::type pidmap = get(CGAL::dynamic_face_property_t(), tm1); CGAL::Polygon_mesh_processing::connected_components( - tm1, pidmap, CGAL::parameters::use_default_values()); + tm1, pidmap, CGAL::parameters::default_values()); PMP::split_connected_components(tm1, meshes, params::face_patch_map(pidmap)); @@ -734,7 +734,7 @@ void test_split() PMP::split(tm1, tm2); PMP::split_connected_components(tm1, meshes, - params::use_default_values()); + params::default_values()); assert(meshes.size() == 2); //if the order is not deterministc, put the num_vertices in a list and check @@ -761,7 +761,7 @@ void test_split() PMP::split(tm1, tm2, params::throw_on_self_intersection(true), params::do_not_modify(true)); - PMP::split_connected_components(tm1, meshes, params::use_default_values()); + PMP::split_connected_components(tm1, meshes, params::default_values()); assert(meshes.size() == 3); //if the order is not deterministc, put the num_vertices in a list and check //if the list does contain all those numbers. @@ -829,7 +829,7 @@ void test_isocuboid() PMP::split(tm, splitter, params::throw_on_self_intersection(true) .allow_self_intersections(true)); - PMP::split_connected_components(tm, meshes, params::use_default_values()); + PMP::split_connected_components(tm, meshes, params::default_values()); assert(meshes.size() == 4); std::set sizes; @@ -848,7 +848,7 @@ void test_isocuboid() PMP::clip(tm, splitter, params::throw_on_self_intersection(true) .allow_self_intersections(true)); - PMP::split_connected_components(tm, meshes, params::use_default_values()); + PMP::split_connected_components(tm, meshes, params::default_values()); assert(meshes.size() == 2); //if the order is not deterministc, put the num_vertices in a list and check //if the list does contain all those numbers. diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_locate.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_locate.cpp index a0d563f9d4e..9102d733047 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_locate.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_locate.cpp @@ -223,7 +223,7 @@ void test_constructions(const G& g, // --------------------------------------------------------------------------- // just to check the API PMP::construct_point(loc, g); - PMP::construct_point(loc, g, CGAL::parameters::use_default_values()); + PMP::construct_point(loc, g, CGAL::parameters::default_values()); } template diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp index 9a23aacbe3f..8c29d53a7ad 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp @@ -10,7 +10,7 @@ namespace CGAL { template -void my_function_with_named_parameters(PolygonMesh& mesh, const NamedParameters& np = parameters::use_default_values()) +void my_function_with_named_parameters(PolygonMesh& mesh, const NamedParameters& np = parameters::default_values()) { //The class containing all the geometric definitions for the PolygonMesh typedef typename GetGeomTraits::type Traits; diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_degeneracies.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_degeneracies.cpp index 2d3935f7ef3..94857b088bb 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_degeneracies.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_degeneracies.cpp @@ -38,10 +38,10 @@ void detect_degeneracies(const EdgeRange& edge_range, std::set dedges; PMP::degenerate_edges(mesh, std::inserter(dedges, dedges.end())); PMP::degenerate_edges(edge_range, mesh, std::inserter(dedges, dedges.begin())); - PMP::degenerate_edges(mesh, std::inserter(dedges, dedges.end()), CP::use_default_values()); + PMP::degenerate_edges(mesh, std::inserter(dedges, dedges.end()), CP::default_values()); dedges.clear(); - PMP::degenerate_edges(edge_range, mesh, std::inserter(dedges, dedges.begin()), CP::use_default_values()); + PMP::degenerate_edges(edge_range, mesh, std::inserter(dedges, dedges.begin()), CP::default_values()); std::cout << "\t" << dedges.size() << " degenerate edges vs " << expected_dedges_n << std::endl; assert(dedges.size() == expected_dedges_n); @@ -49,10 +49,10 @@ void detect_degeneracies(const EdgeRange& edge_range, std::vector dfaces; PMP::degenerate_faces(mesh, std::back_inserter(dfaces)); PMP::degenerate_faces(face_range, mesh, std::back_inserter(dfaces)); - PMP::degenerate_faces(mesh, std::back_inserter(dfaces), CP::use_default_values()); + PMP::degenerate_faces(mesh, std::back_inserter(dfaces), CP::default_values()); dfaces.clear(); - PMP::degenerate_faces(face_range, mesh, std::back_inserter(dfaces), CP::use_default_values()); + PMP::degenerate_faces(face_range, mesh, std::back_inserter(dfaces), CP::default_values()); std::cout << "\t" << dfaces.size() << " degenerate faces vs " << expected_dfaces_n << std::endl; assert(dfaces.size() == expected_dfaces_n); } @@ -103,7 +103,7 @@ bool remove_dedges(const std::vector& edges_selection_ids, for(std::size_t edge_id : edges_selection_ids) edge_range.push_back(all_edges[edge_id]); - return CGAL::Polygon_mesh_processing::remove_degenerate_edges(edge_range, mesh, CP::use_default_values()); + return CGAL::Polygon_mesh_processing::remove_degenerate_edges(edge_range, mesh, CP::default_values()); } template @@ -119,7 +119,7 @@ bool remove_dfaces(const std::vector& faces_selection_ids, for(std::size_t face_id : faces_selection_ids) face_range.push_back(all_faces[face_id]); - return CGAL::Polygon_mesh_processing::remove_degenerate_faces(face_range, mesh, CP::use_default_values()); + return CGAL::Polygon_mesh_processing::remove_degenerate_faces(face_range, mesh, CP::default_values()); } template @@ -153,12 +153,12 @@ void remove_degeneracies(const std::string filename, // Complete remove std::cout << " Remove all..." << std::endl; mesh = mesh_cpy; - /* bool all_removed = */ CGAL::Polygon_mesh_processing::remove_degenerate_edges(mesh, CP::use_default_values()); + /* bool all_removed = */ CGAL::Polygon_mesh_processing::remove_degenerate_edges(mesh, CP::default_values()); //assert(all_removed); assert(CGAL::is_valid_polygon_mesh(mesh)); mesh = mesh_cpy; - /* all_removed = */ CGAL::Polygon_mesh_processing::remove_degenerate_faces(mesh, CP::use_default_values()); + /* all_removed = */ CGAL::Polygon_mesh_processing::remove_degenerate_faces(mesh, CP::default_values()); // assert(all_removed); assert(CGAL::is_valid_polygon_mesh(mesh)); diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_snapping.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_snapping.cpp index 8133793c15a..fa5fd3ba479 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_snapping.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_snapping.cpp @@ -116,7 +116,7 @@ void test_1() CGAL::Constant_property_map tol_map_good(0.001); res = PMP::experimental::snap_vertices(border_vertices, fg_source_cpy, tol_map_good, target_halfedge_range, fg_target, tol_map_good, - params::use_default_values(), params::do_lock_mesh(true)); + params::default_values(), params::do_lock_mesh(true)); std::cout << "res: " << res << " vertices" << std::endl; assert(res == 76); @@ -129,7 +129,7 @@ void test_1() res = PMP::experimental::snap_vertices(border_vertices, fg_source_cpy, target_halfedge_range, fg_target, - params::use_default_values(), params::do_lock_mesh(true)); + params::default_values(), params::do_lock_mesh(true)); std::cout << "res: " << res << " vertices" << std::endl; assert(res == 77); diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp index cbd8e75f990..54359fe334e 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp @@ -21,7 +21,7 @@ int main() Mesh m; CGAL::make_tetrahedron(Point(0,0,0), Point(0,0,1), Point(0,1,2), Point(1,0,3), m); CGAL::Aff_transformation_3 trans(0,0,0,1,0,1,0,0,0,0,1,1); - PMP::transform(trans, m, params::use_default_values()); + PMP::transform(trans, m, params::default_values()); bool ok = true; for(Mesh::size_type i = 0; i polygons_copy(polygons); res = PMP::merge_duplicate_polygons_in_polygon_soup(points, polygons_copy, - params::use_default_values()); + params::default_values()); assert(res == 3 && polygons_copy.size() == 3); // Remove all duplicates diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp index a00362acf84..dca156e9260 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp @@ -355,7 +355,7 @@ public: if(is_polygon_mesh) { FaceGraph* poly = new FaceGraph(); - if (CGAL::IO::internal::vtkPointSet_to_polygon_mesh(data, *poly, CGAL::parameters::use_default_values())) + if (CGAL::IO::internal::vtkPointSet_to_polygon_mesh(data, *poly, CGAL::parameters::default_values())) { Scene_facegraph_item* poly_item = new Scene_facegraph_item(poly); if(group) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp index 720baf864de..b39fd8b8f0a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp @@ -311,7 +311,7 @@ void Polyhedron_demo_intersection_plugin::intersectionSurfacePolyline() polylines, *itemA->face_graph(), std::back_inserter(poly_intersections), - CGAL::parameters::use_default_values()); + CGAL::parameters::default_values()); Q_FOREACH(const Poly_intersection& inter, poly_intersections) { diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp index eec48bce1ef..c473dd5a267 100644 --- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp @@ -1551,7 +1551,7 @@ Scene_surface_mesh_item::save(std::ostream& out) const } else { - CGAL::IO::internal::write_OFF_BGL(out,*d->smesh_, CGAL::parameters::use_default_values()); + CGAL::IO::internal::write_OFF_BGL(out,*d->smesh_, CGAL::parameters::default_values()); } QApplication::restoreOverrideCursor(); return (bool) out; diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h b/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h index 0a2749076fe..f2bd4e37871 100644 --- a/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h +++ b/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h @@ -394,7 +394,7 @@ bool read_surf(std::istream& input, std::vector& output, CGAL::Bbox_3& grid_box, std::array& grid_size, DuplicatedPointsOutIterator out, - const NamedParameters& = CGAL::parameters::use_default_values()) + const NamedParameters& = CGAL::parameters::default_values()) { typedef typename CGAL::GetGeomTraits::type Kernel; typedef typename Kernel::Point_3 Point_3; diff --git a/Polyhedron/include/CGAL/IO/Polyhedron_OFF_iostream.h b/Polyhedron/include/CGAL/IO/Polyhedron_OFF_iostream.h index 55617c712d5..936fd123c85 100644 --- a/Polyhedron/include/CGAL/IO/Polyhedron_OFF_iostream.h +++ b/Polyhedron/include/CGAL/IO/Polyhedron_OFF_iostream.h @@ -43,7 +43,7 @@ template bool read_OFF(std::istream& in, Polyhedron_3& P, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef typename boost::graph_traits >::vertex_descriptor Vertex; @@ -96,7 +96,7 @@ template bool read_OFF(const std::string& fname, Polyhedron_3& P, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::ifstream in(fname); return read_OFF(in, P, np); @@ -126,7 +126,7 @@ template < class Traits, class Alloc, class CGAL_BGL_NP_TEMPLATE_PARAMETERS> bool write_OFF(std::ostream& out, const Polyhedron_3& P, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/STL_Extension/doc/STL_Extension/CGAL/Named_function_parameters.h b/STL_Extension/doc/STL_Extension/CGAL/Named_function_parameters.h index bffe906f2db..e48e624a37a 100644 --- a/STL_Extension/doc/STL_Extension/CGAL/Named_function_parameters.h +++ b/STL_Extension/doc/STL_Extension/CGAL/Named_function_parameters.h @@ -6,6 +6,6 @@ typedef unspecified_type Default_named_parameters; /// \ingroup PkgSTLExtensionRef /// returns a default named parameter type indicating that default values should be used. -Default_named_parameters use_default_values(); +Default_named_parameters default_values(); } } diff --git a/STL_Extension/doc/STL_Extension/PackageDescription.txt b/STL_Extension/doc/STL_Extension/PackageDescription.txt index b4c351a4a3a..a4df6c9b0bb 100644 --- a/STL_Extension/doc/STL_Extension/PackageDescription.txt +++ b/STL_Extension/doc/STL_Extension/PackageDescription.txt @@ -118,7 +118,7 @@ - `CGAL::Compact_location` - `CGAL::value_type_traits` - `CGAL::parameters::Default_named_parameters` -- `CGAL::parameters::use_default_values()` +- `CGAL::parameters::default_values()` */ diff --git a/STL_Extension/include/CGAL/Named_function_parameters.h b/STL_Extension/include/CGAL/Named_function_parameters.h index 515dcb42b30..0f651a94769 100644 --- a/STL_Extension/include/CGAL/Named_function_parameters.h +++ b/STL_Extension/include/CGAL/Named_function_parameters.h @@ -270,7 +270,7 @@ inline all_default() #endif Default_named_parameters -inline use_default_values() +inline default_values() { return Default_named_parameters(); } diff --git a/STL_Extension/test/STL_Extension/test_cgal_named_params.cpp b/STL_Extension/test/STL_Extension/test_cgal_named_params.cpp index 7c9f88be21e..2ae445fbfd5 100644 --- a/STL_Extension/test/STL_Extension/test_cgal_named_params.cpp +++ b/STL_Extension/test/STL_Extension/test_cgal_named_params.cpp @@ -102,7 +102,7 @@ int main() .face_index_map(std::reference_wrapper(b)) ); - auto d = CGAL::parameters::use_default_values(); + auto d = CGAL::parameters::default_values(); CGAL_static_assertion( (std::is_same::value) ); #ifndef CGAL_NO_DEPRECATED_CODE auto d1 = CGAL::parameters::all_default(); diff --git a/Shape_regularization/include/CGAL/Shape_regularization/Contours/Longest_direction_2.h b/Shape_regularization/include/CGAL/Shape_regularization/Contours/Longest_direction_2.h index 07b482fa998..199417f31b1 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/Contours/Longest_direction_2.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/Contours/Longest_direction_2.h @@ -99,7 +99,7 @@ namespace Contours { Longest_direction_2( const InputRange& input_range, const bool is_closed, - const NamedParameters& np = parameters::use_default_values()) : + const NamedParameters& np = parameters::default_values()) : m_input_range(input_range), m_point_map(parameters::choose_parameter(parameters::get_parameter( np, internal_np::point_map), PointMap())) { diff --git a/Shape_regularization/include/CGAL/Shape_regularization/Contours/Multiple_directions_2.h b/Shape_regularization/include/CGAL/Shape_regularization/Contours/Multiple_directions_2.h index 118ed30acc0..6d0ac4dca6f 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/Contours/Multiple_directions_2.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/Contours/Multiple_directions_2.h @@ -124,7 +124,7 @@ namespace Contours { Multiple_directions_2( const InputRange& input_range, const bool is_closed, - const NamedParameters& np = parameters::use_default_values()) : + const NamedParameters& np = parameters::default_values()) : m_input_range(input_range), m_point_map(parameters::choose_parameter(parameters::get_parameter( np, internal_np::point_map), PointMap())) { diff --git a/Shape_regularization/include/CGAL/Shape_regularization/Contours/User_defined_directions_2.h b/Shape_regularization/include/CGAL/Shape_regularization/Contours/User_defined_directions_2.h index 5859906bf9b..442efbe56a7 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/Contours/User_defined_directions_2.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/Contours/User_defined_directions_2.h @@ -113,7 +113,7 @@ namespace Contours { const InputRange& input_range, const bool is_closed, const DirectionRange& direction_range, - const NamedParameters& np = parameters::use_default_values()) : + const NamedParameters& np = parameters::default_values()) : m_input_range(input_range), m_point_map(parameters::choose_parameter(parameters::get_parameter( np, internal_np::point_map), PointMap())), diff --git a/Shape_regularization/include/CGAL/Shape_regularization/QP_regularization.h b/Shape_regularization/include/CGAL/Shape_regularization/QP_regularization.h index 4a6b628ea0e..95afdaf02ce 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/QP_regularization.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/QP_regularization.h @@ -145,7 +145,7 @@ namespace Shape_regularization { NeighQuery& neighbor_query, RegType& regularization_type, QPSolver& quadratic_program, - const NamedParameters& np = parameters::use_default_values()) : + const NamedParameters& np = parameters::default_values()) : m_input_range(input_range), m_neighbor_query(neighbor_query), m_regularization_type(regularization_type), diff --git a/Shape_regularization/include/CGAL/Shape_regularization/Segments/Angle_regularization_2.h b/Shape_regularization/include/CGAL/Shape_regularization/Segments/Angle_regularization_2.h index a33cb654810..4413dd3c133 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/Segments/Angle_regularization_2.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/Segments/Angle_regularization_2.h @@ -118,7 +118,7 @@ namespace Segments { template Angle_regularization_2( InputRange& input_range, - const NamedParameters& np = parameters::use_default_values()) : + const NamedParameters& np = parameters::default_values()) : m_input_range(input_range), m_segment_map(parameters::choose_parameter(parameters::get_parameter( np, internal_np::segment_map), SegmentMap())), diff --git a/Shape_regularization/include/CGAL/Shape_regularization/Segments/Delaunay_neighbor_query_2.h b/Shape_regularization/include/CGAL/Shape_regularization/Segments/Delaunay_neighbor_query_2.h index 88abdd06bba..ef31b408965 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/Segments/Delaunay_neighbor_query_2.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/Segments/Delaunay_neighbor_query_2.h @@ -108,7 +108,7 @@ namespace Segments { template Delaunay_neighbor_query_2( const InputRange& input_range, - const NamedParameters& np = parameters::use_default_values()) : + const NamedParameters& np = parameters::default_values()) : m_input_range(input_range), m_segment_map(parameters::choose_parameter(parameters::get_parameter( np, internal_np::segment_map), SegmentMap())) { diff --git a/Shape_regularization/include/CGAL/Shape_regularization/Segments/Offset_regularization_2.h b/Shape_regularization/include/CGAL/Shape_regularization/Segments/Offset_regularization_2.h index 31ba76b3f3d..0ea5e7e1523 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/Segments/Offset_regularization_2.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/Segments/Offset_regularization_2.h @@ -122,7 +122,7 @@ namespace Segments { template Offset_regularization_2( InputRange& input_range, - const NamedParameters& np = parameters::use_default_values()) : + const NamedParameters& np = parameters::default_values()) : m_input_range(input_range), m_segment_map(parameters::choose_parameter(parameters::get_parameter( np, internal_np::segment_map), SegmentMap())), diff --git a/Shape_regularization/include/CGAL/Shape_regularization/regularize_contours.h b/Shape_regularization/include/CGAL/Shape_regularization/regularize_contours.h index 06b1112daa4..1930fd31c06 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/regularize_contours.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/regularize_contours.h @@ -120,7 +120,7 @@ namespace Contours { const InputRange& input_range, const ContDirections& directions, OutIterator contour, - const NamedParameters& np = parameters::use_default_values()) { + const NamedParameters& np = parameters::default_values()) { using PointMap = typename CGAL::GetPointMap::type; using Point_2 = typename PointMap::value_type; @@ -243,7 +243,7 @@ namespace Contours { const InputRange& input_range, const ContDirections& directions, OutIterator contour, - const NamedParameters& np = parameters::use_default_values()) { + const NamedParameters& np = parameters::default_values()) { using PointMap = typename CGAL::GetPointMap::type; using Point_2 = typename PointMap::value_type; diff --git a/Shape_regularization/include/CGAL/Shape_regularization/regularize_planes.h b/Shape_regularization/include/CGAL/Shape_regularization/regularize_planes.h index f71489be2ef..8820caa4d87 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/regularize_planes.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/regularize_planes.h @@ -288,7 +288,7 @@ namespace Planes { const PlaneMap plane_map, const PointRange& points, const PointMap point_map, - const NamedParameters& np = parameters::use_default_values()) { + const NamedParameters& np = parameters::default_values()) { using parameters::get_parameter; using parameters::choose_parameter; diff --git a/Shape_regularization/include/CGAL/Shape_regularization/regularize_segments.h b/Shape_regularization/include/CGAL/Shape_regularization/regularize_segments.h index 8564bbb0591..2042cff97b5 100644 --- a/Shape_regularization/include/CGAL/Shape_regularization/regularize_segments.h +++ b/Shape_regularization/include/CGAL/Shape_regularization/regularize_segments.h @@ -135,7 +135,7 @@ namespace Segments { NeighQuery& neighbor_query, RegType& regularization_type, QPSolver& quadratic_program, - const NamedParameters& np = parameters::use_default_values()) { + const NamedParameters& np = parameters::default_values()) { using SegmentMap = typename internal::GetSegmentMap::type; using Segment_2 = typename SegmentMap::value_type; @@ -370,7 +370,7 @@ namespace Segments { OutIterator parallel_groups( const InputRange& input_range, OutIterator groups, - const NamedParameters& np = parameters::use_default_values()) { + const NamedParameters& np = parameters::default_values()) { using SegmentMap = typename internal::GetSegmentMap::type; using Segment_2 = typename SegmentMap::value_type; @@ -463,7 +463,7 @@ namespace Segments { OutIterator collinear_groups( const InputRange& input_range, OutIterator groups, - const NamedParameters& np = parameters::use_default_values()) { + const NamedParameters& np = parameters::default_values()) { using SegmentMap = typename internal::GetSegmentMap::type; using Segment_2 = typename SegmentMap::value_type; @@ -556,7 +556,7 @@ namespace Segments { OutIterator orthogonal_groups( const InputRange& input_range, OutIterator groups, - const NamedParameters& np = parameters::use_default_values()) { + const NamedParameters& np = parameters::default_values()) { using SegmentMap = typename internal::GetSegmentMap::type; using Segment_2 = typename SegmentMap::value_type; @@ -648,7 +648,7 @@ namespace Segments { OutIterator unique_segments( const InputRange& input_range, OutIterator segments, - const NamedParameters& np = parameters::use_default_values()) { + const NamedParameters& np = parameters::default_values()) { using SegmentMap = typename internal::GetSegmentMap::type; using Segment_2 = typename SegmentMap::value_type; diff --git a/Shape_regularization/test/Shape_regularization/test_closed_contour_10_edges.cpp b/Shape_regularization/test/Shape_regularization/test_closed_contour_10_edges.cpp index ee8746b06d8..0b686d4c640 100644 --- a/Shape_regularization/test/Shape_regularization/test_closed_contour_10_edges.cpp +++ b/Shape_regularization/test/Shape_regularization/test_closed_contour_10_edges.cpp @@ -37,7 +37,7 @@ void test_closed_contour_10_edges() { std::vector regularized; SR::Contours::regularize_closed_contour( contour, directions, std::back_inserter(regularized), - CGAL::parameters::use_default_values()); + CGAL::parameters::default_values()); const std::size_t num_directions = directions.number_of_directions(); diff --git a/Shape_regularization/test/Shape_regularization/test_closed_contour_6_edges.cpp b/Shape_regularization/test/Shape_regularization/test_closed_contour_6_edges.cpp index 4d9e2f6f2f9..e56abd6d229 100644 --- a/Shape_regularization/test/Shape_regularization/test_closed_contour_6_edges.cpp +++ b/Shape_regularization/test/Shape_regularization/test_closed_contour_6_edges.cpp @@ -32,7 +32,7 @@ void test_closed_contour_6_edges() { std::vector regularized; SR::Contours::regularize_closed_contour( contour, directions, std::back_inserter(regularized), - CGAL::parameters::use_default_values()); + CGAL::parameters::default_values()); const std::size_t num_directions = directions.number_of_directions(); diff --git a/Shape_regularization/test/Shape_regularization/test_neighbor_query.cpp b/Shape_regularization/test/Shape_regularization/test_neighbor_query.cpp index 3093bdc667f..6dfa9a60ec3 100644 --- a/Shape_regularization/test/Shape_regularization/test_neighbor_query.cpp +++ b/Shape_regularization/test/Shape_regularization/test_neighbor_query.cpp @@ -38,7 +38,7 @@ void test_neighbor_query() { Indices neighbors; NQ neighbor_query( - segments, CGAL::parameters::use_default_values()); + segments, CGAL::parameters::default_values()); // Check unique group. Segments edges; diff --git a/Shape_regularization/test/Shape_regularization/test_open_contour_5_edges.cpp b/Shape_regularization/test/Shape_regularization/test_open_contour_5_edges.cpp index d74c5d5f79d..4ed7d06394f 100644 --- a/Shape_regularization/test/Shape_regularization/test_open_contour_5_edges.cpp +++ b/Shape_regularization/test/Shape_regularization/test_open_contour_5_edges.cpp @@ -32,7 +32,7 @@ void test_open_contour_5_edges() { std::vector regularized; SR::Contours::regularize_open_contour( contour, directions, std::back_inserter(regularized), - CGAL::parameters::use_default_values()); + CGAL::parameters::default_values()); const std::size_t num_directions = directions.number_of_directions(); diff --git a/Shape_regularization/test/Shape_regularization/test_open_contour_9_edges.cpp b/Shape_regularization/test/Shape_regularization/test_open_contour_9_edges.cpp index 1cce9716eb0..9e8fa306c56 100644 --- a/Shape_regularization/test/Shape_regularization/test_open_contour_9_edges.cpp +++ b/Shape_regularization/test/Shape_regularization/test_open_contour_9_edges.cpp @@ -37,7 +37,7 @@ void test_open_contour_9_edges() { std::vector regularized; SR::Contours::regularize_open_contour( contour, directions, std::back_inserter(regularized), - CGAL::parameters::use_default_values()); + CGAL::parameters::default_values()); const std::size_t num_directions = directions.number_of_directions(); diff --git a/Shape_regularization/test/Shape_regularization/test_overloads.cpp b/Shape_regularization/test/Shape_regularization/test_overloads.cpp index b8d432d1f19..6900deeb143 100644 --- a/Shape_regularization/test/Shape_regularization/test_overloads.cpp +++ b/Shape_regularization/test/Shape_regularization/test_overloads.cpp @@ -52,7 +52,7 @@ void test_overloads() { CD odirections(points, false); SR::Segments::regularize_segments( - segments, neighbor_query, angle_regularization, quadratic_program, CGAL::parameters::use_default_values()); + segments, neighbor_query, angle_regularization, quadratic_program, CGAL::parameters::default_values()); SR::Segments::regularize_segments( segments, neighbor_query, angle_regularization, quadratic_program); SR::Segments::regularize_segments( @@ -66,34 +66,34 @@ void test_overloads() { segments); SR::Segments::parallel_groups( - segments, std::back_inserter(indices), CGAL::parameters::use_default_values()); + segments, std::back_inserter(indices), CGAL::parameters::default_values()); SR::Segments::parallel_groups( segments, std::back_inserter(indices)); SR::Segments::collinear_groups( - segments, std::back_inserter(indices), CGAL::parameters::use_default_values()); + segments, std::back_inserter(indices), CGAL::parameters::default_values()); SR::Segments::collinear_groups( segments, std::back_inserter(indices)); SR::Segments::orthogonal_groups( - segments, std::back_inserter(indices), CGAL::parameters::use_default_values()); + segments, std::back_inserter(indices), CGAL::parameters::default_values()); SR::Segments::orthogonal_groups( segments, std::back_inserter(indices)); SR::Segments::unique_segments( - segments, std::back_inserter(unique), CGAL::parameters::use_default_values()); + segments, std::back_inserter(unique), CGAL::parameters::default_values()); SR::Segments::unique_segments( segments, std::back_inserter(unique)); SR::Contours::regularize_closed_contour( - points, cdirections, std::back_inserter(contour), CGAL::parameters::use_default_values()); + points, cdirections, std::back_inserter(contour), CGAL::parameters::default_values()); SR::Contours::regularize_closed_contour( points, cdirections, std::back_inserter(contour)); SR::Contours::regularize_closed_contour( points, std::back_inserter(contour)); SR::Contours::regularize_open_contour( - points, odirections, std::back_inserter(contour), CGAL::parameters::use_default_values()); + points, odirections, std::back_inserter(contour), CGAL::parameters::default_values()); SR::Contours::regularize_open_contour( points, odirections, std::back_inserter(contour)); SR::Contours::regularize_open_contour( diff --git a/Stream_support/include/CGAL/IO/GOCAD.h b/Stream_support/include/CGAL/IO/GOCAD.h index 7ecac6d079d..b77dba1d458 100644 --- a/Stream_support/include/CGAL/IO/GOCAD.h +++ b/Stream_support/include/CGAL/IO/GOCAD.h @@ -194,7 +194,7 @@ template >::type* = nullptr #endif @@ -239,7 +239,7 @@ template >::type* = nullptr #endif @@ -347,7 +347,7 @@ template >::type* = nullptr #endif @@ -389,7 +389,7 @@ template >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/Generic_writer.h b/Stream_support/include/CGAL/IO/Generic_writer.h index 37a340a4a5e..b91a8a5b7f7 100644 --- a/Stream_support/include/CGAL/IO/Generic_writer.h +++ b/Stream_support/include/CGAL/IO/Generic_writer.h @@ -36,7 +36,7 @@ public: template bool operator()(const PointRange& points, const PolygonRange& polygons, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef typename boost::range_value::type Poly; diff --git a/Stream_support/include/CGAL/IO/OBJ.h b/Stream_support/include/CGAL/IO/OBJ.h index 0c6c941e9d8..8d59dd20320 100644 --- a/Stream_support/include/CGAL/IO/OBJ.h +++ b/Stream_support/include/CGAL/IO/OBJ.h @@ -210,7 +210,7 @@ template >::type* = nullptr #endif @@ -255,7 +255,7 @@ template >::type* = nullptr #endif @@ -303,7 +303,7 @@ template >::type* = nullptr #endif @@ -347,7 +347,7 @@ template >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/OFF.h b/Stream_support/include/CGAL/IO/OFF.h index f13e608e46d..76787a9dac4 100644 --- a/Stream_support/include/CGAL/IO/OFF.h +++ b/Stream_support/include/CGAL/IO/OFF.h @@ -182,7 +182,7 @@ template >::type* = nullptr #endif @@ -235,7 +235,7 @@ template >::type* = nullptr #endif @@ -280,7 +280,7 @@ template >::type* = nullptr #endif @@ -321,7 +321,7 @@ template >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/PLY.h b/Stream_support/include/CGAL/IO/PLY.h index ae6087ec24a..4e8cc448eb9 100644 --- a/Stream_support/include/CGAL/IO/PLY.h +++ b/Stream_support/include/CGAL/IO/PLY.h @@ -307,7 +307,7 @@ template >::type* = nullptr #endif @@ -367,7 +367,7 @@ template >::type* = nullptr #endif @@ -430,7 +430,7 @@ template >::type* = nullptr #endif @@ -509,7 +509,7 @@ template >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/STL.h b/Stream_support/include/CGAL/IO/STL.h index a3cfc6a7eee..8ebef216cf2 100644 --- a/Stream_support/include/CGAL/IO/STL.h +++ b/Stream_support/include/CGAL/IO/STL.h @@ -72,7 +72,7 @@ template >::type* = nullptr #endif @@ -206,7 +206,7 @@ template >::type* = nullptr #endif @@ -272,7 +272,7 @@ template >::type* = nullptr #endif @@ -380,7 +380,7 @@ template >::type* = nullptr #endif diff --git a/Stream_support/include/CGAL/IO/VTK.h b/Stream_support/include/CGAL/IO/VTK.h index de10958bfd0..6373040dcf2 100644 --- a/Stream_support/include/CGAL/IO/VTK.h +++ b/Stream_support/include/CGAL/IO/VTK.h @@ -137,7 +137,7 @@ bool read_VTP(const std::string& fname, template bool read_VTP(const std::string& fname, PointRange& points, PolygonRange& polygons) { - return read_VTP(fname, points, polygons, parameters::use_default_values()); + return read_VTP(fname, points, polygons, parameters::default_values()); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -378,7 +378,7 @@ template -void CatmullClark_subdivision(PolygonMesh& pmesh, const NamedParameters& np = parameters::use_default_values()) { +void CatmullClark_subdivision(PolygonMesh& pmesh, const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -181,7 +181,7 @@ void Loop_subdivision(PolygonMesh& pmesh, int step) { * \cgalNamedParamsEnd **/ template -void Loop_subdivision(PolygonMesh& pmesh, const NamedParameters& np = parameters::use_default_values()) { +void Loop_subdivision(PolygonMesh& pmesh, const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -238,7 +238,7 @@ void DooSabin_subdivision(PolygonMesh& pmesh, int step) { * \cgalNamedParamsEnd **/ template -void DooSabin_subdivision(PolygonMesh& pmesh, const NamedParameters& np = parameters::use_default_values()) { +void DooSabin_subdivision(PolygonMesh& pmesh, const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -300,7 +300,7 @@ void Sqrt3_subdivision(PolygonMesh& pmesh, int step) { * \pre `pmesh` must be a triangle mesh. **/ template -void Sqrt3_subdivision(PolygonMesh& pmesh, const NamedParameters& np = parameters::use_default_values()) { +void Sqrt3_subdivision(PolygonMesh& pmesh, const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h b/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h index 7b7051897ec..db942e22131 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/OFF.h @@ -322,7 +322,7 @@ template bool read_OFF(std::istream& is, Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; @@ -343,7 +343,7 @@ template bool read_OFF(const std::string& fname, Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::ifstream in(fname.c_str()); return read_OFF(in, sm, np); @@ -358,7 +358,7 @@ bool read_OFF(const std::string& fname, \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::use_default_values()) +CGAL_DEPRECATED bool read_off(std::istream& is, Surface_mesh& sm, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::read_OFF(is, sm, np); } @@ -370,7 +370,7 @@ CGAL_DEPRECATED bool read_off(std::istream& is, Surface_mesh& sm, const C template CGAL_DEPRECATED bool read_off(Surface_mesh& sm, const std::string& filename) { - return IO::read_OFF(filename, sm, parameters::use_default_values()); + return IO::read_OFF(filename, sm, parameters::default_values()); } #endif // CGAL_NO_DEPRECATED_CODE @@ -557,7 +557,7 @@ bool write_OFF_with_or_without_vnormals(std::ostream& os, template bool write_OFF(std::ostream& os, const Surface_mesh& sm, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::is_default_parameter; @@ -579,7 +579,7 @@ bool write_OFF(std::ostream& os, \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::use_default_values()) +CGAL_DEPRECATED bool write_off(std::ostream& os, const Surface_mesh& sm, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { return IO::write_OFF(os, sm, np); } @@ -591,7 +591,7 @@ CGAL_DEPRECATED bool write_off(std::ostream& os, const Surface_mesh& sm, template CGAL_DEPRECATED bool write_off(const Surface_mesh& sm, const std::string& filename) { - return IO::write_OFF(filename, sm, parameters::use_default_values()); + return IO::write_OFF(filename, sm, parameters::default_values()); } #endif // CGAL_NO_DEPRECATED_CODE diff --git a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h index d2d6dc50015..6f37f8604fb 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h @@ -911,7 +911,7 @@ template & sm, const std::string& comments, - const CGAL_BGL_NP_CLASS& np = parameters::use_default_values()) + const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { typedef Surface_mesh

SMesh; typedef typename SMesh::Vertex_index VIndex; @@ -1107,7 +1107,7 @@ 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::use_default_values()) +bool write_PLY(std::ostream& os, const Surface_mesh

& sm, const CGAL_BGL_NP_CLASS& np = parameters::default_values()) { std::string unused_comment; return write_PLY(os, sm, unused_comment, np); diff --git a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp index 53bc7ac1462..5cc0554a11d 100644 --- a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp +++ b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) t0.reset(); t0.start(); - approx.extract_mesh(CGAL::parameters::use_default_values()); + approx.extract_mesh(CGAL::parameters::default_values()); t0.stop(); std::cout << "meshing time " << t0.time() << " sec." << std::endl; diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_class_interface_example.cpp b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_class_interface_example.cpp index 802f06fe8d9..1a3815ca911 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_class_interface_example.cpp +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_class_interface_example.cpp @@ -61,7 +61,7 @@ int main(int argc, char** argv) approx.run(10); // extract approximated mesh with default parameters - approx.extract_mesh(CGAL::parameters::use_default_values()); + approx.extract_mesh(CGAL::parameters::default_values()); // get approximated triangle soup std::vector anchors; diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h index 51e1f9648ee..48d6812c384 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h @@ -84,7 +84,7 @@ struct Dummy_visitor template int edge_collapse(TM& tmesh, const ShouldStop& should_stop, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { using parameters::choose_parameter; using parameters::get_parameter; diff --git a/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h b/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h index de78439e5a7..581e459ab90 100644 --- a/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h +++ b/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h @@ -163,7 +163,7 @@ template& tr, const double& target_edge_length, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef CGAL::Triangulation_3 Triangulation; tetrahedral_isotropic_remeshing( @@ -178,7 +178,7 @@ template& tr, const float& target_edge_length, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef CGAL::Triangulation_3 Triangulation; tetrahedral_isotropic_remeshing( @@ -343,7 +343,7 @@ template& c3t3, const double& target_edge_length, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { tetrahedral_isotropic_remeshing( c3t3, @@ -358,7 +358,7 @@ template& c3t3, const float& target_edge_length, - const NamedParameters& np = parameters::use_default_values) + const NamedParameters& np = parameters::default_values) { tetrahedral_isotropic_remeshing( c3t3, @@ -374,7 +374,7 @@ template& c3t3, const SizingFunction& sizing, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { CGAL_assertion(c3t3.triangulation().tds().is_valid(true)); diff --git a/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2/IO/OFF.h b/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2/IO/OFF.h index 4f70bba00ba..fb5ba3d6605 100644 --- a/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2/IO/OFF.h +++ b/Triangulation_on_sphere_2/include/CGAL/Triangulation_on_sphere_2/IO/OFF.h @@ -65,7 +65,7 @@ namespace IO { template bool write_OFF(std::ostream& os, const CGAL::Triangulation_on_sphere_2& dt, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { typedef Triangulation_on_sphere_2 Tr; typedef typename Tr::Vertex_handle Vertex_handle; @@ -156,7 +156,7 @@ bool write_OFF(std::ostream& os, template bool write_OFF(const std::string& fname, const CGAL::Triangulation_on_sphere_2& dt, - const NamedParameters& np = parameters::use_default_values()) + const NamedParameters& np = parameters::default_values()) { std::ofstream os(fname); // stream precision will be set in the ostream overload return write_OFF(os, dt, np);