songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename named function parameter class

This commit is contained in:
Sébastien Loriot 2019-07-14 22:54:16 +02:00
parent 0343659467
commit 560c77f567
62 changed files with 97 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
View File

@ -33,7 +33,7 @@
*/
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/graph/graph_concepts.hpp>
#include <CGAL/boost/iterator/counting_iterator.hpp>

2
Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_2.h
View File

@ -34,7 +34,7 @@
*/
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/Arrangement_2.h>
#include <CGAL/Arrangement_2/graph_traits_dual.h>

2
Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_2.h
View File

@ -34,7 +34,7 @@
*/
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/Arrangement_on_surface_2.h>
#include <CGAL/Arrangement_2/graph_traits_dual.h>

2
Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_with_history_2.h
View File

@ -35,7 +35,7 @@
*/
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/Arrangement_on_surface_with_history_2.h>
#include <CGAL/Arrangement_2/graph_traits_dual.h>

2
Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_with_history_2.h
View File

@ -35,7 +35,7 @@
*/
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/Arrangement_with_history_2.h>
#include <CGAL/Arrangement_2/graph_traits_dual.h>

2
BGL/include/CGAL/boost/graph/Face_filtered_graph.h
View File

@ -24,7 +24,7 @@
#include <CGAL/assertions.h>
#include <CGAL/boost/graph/properties.h>
#include <CGAL/boost/graph/iterator.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/Dynamic_property_map.h>
#include <CGAL/assertions.h>

2
BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h
View File

@ -26,7 +26,7 @@
#include <CGAL/boost/graph/copy_face_graph.h>
#include <CGAL/boost/graph/Face_filtered_graph.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/assertions.h>

2
BGL/include/CGAL/boost/graph/METIS/partition_graph.h
View File

@ -24,7 +24,7 @@
#include <CGAL/boost/graph/copy_face_graph.h>
#include <CGAL/boost/graph/Face_filtered_graph.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/assertions.h>

34
BGL/include/CGAL/boost/graph/named_function_params.h → BGL/include/CGAL/boost/graph/Named_function_parameters.h
View File

@ -27,7 +27,7 @@
#include <boost/mpl/if.hpp>
#define CGAL_BGL_NP_TEMPLATE_PARAMETERS T, typename Tag, typename Base
#define CGAL_BGL_NP_CLASS CGAL::cgal_bgl_named_params<T,Tag,Base>
#define CGAL_BGL_NP_CLASS CGAL::Named_function_parameters<T,Tag,Base>
namespace CGAL {
@ -136,19 +136,19 @@ get_parameter_impl(const Named_params_impl<T, Tag, Base>& np, Query_tag tag)
template <typename T, typename Tag, typename Base = internal_np::No_property>
struct cgal_bgl_named_params
struct Named_function_parameters
: internal_np::Named_params_impl<T, Tag, Base>
{
typedef internal_np::Named_params_impl<T, Tag, Base> base;
typedef cgal_bgl_named_params<T, Tag, Base> self;
typedef Named_function_parameters<T, Tag, Base> self;
cgal_bgl_named_params(T v = T()) : base(v) {}
cgal_bgl_named_params(T v, const Base& b) : base(v, b) {}
Named_function_parameters(T v = T()) : base(v) {}
Named_function_parameters(T v, const Base& b) : base(v, b) {}
cgal_bgl_named_params<bool, internal_np::all_default_t, self>
Named_function_parameters<bool, internal_np::all_default_t, self>
all_default() const
{
typedef cgal_bgl_named_params<bool, internal_np::all_default_t, self> Params;
typedef Named_function_parameters<bool, internal_np::all_default_t, self> Params;
return Params(*this);
}
@ -156,10 +156,10 @@ struct cgal_bgl_named_params
// used to concatenate several parameters
#define CGAL_add_named_parameter(X, Y, Z) \
template<typename K> \
cgal_bgl_named_params<K, internal_np::X, self> \
Named_function_parameters<K, internal_np::X, self> \
Z(const K& k) const \
{ \
typedef cgal_bgl_named_params<K, internal_np::X, self> Params;\
typedef Named_function_parameters<K, internal_np::X, self> Params;\
return Params(k, *this); \
}
#include <CGAL/boost/graph/parameters_interface.h>
@ -168,28 +168,28 @@ struct cgal_bgl_named_params
namespace parameters {
cgal_bgl_named_params<bool, internal_np::all_default_t>
Named_function_parameters<bool, internal_np::all_default_t>
inline all_default()
{
typedef cgal_bgl_named_params<bool, internal_np::all_default_t> Params;
typedef Named_function_parameters<bool, internal_np::all_default_t> Params;
return Params();
}
template <typename T, typename Tag, typename Base>
cgal_bgl_named_params<T,Tag,Base>
inline no_parameters(cgal_bgl_named_params<T,Tag,Base>)
Named_function_parameters<T,Tag,Base>
inline no_parameters(Named_function_parameters<T,Tag,Base>)
{
typedef cgal_bgl_named_params<T,Tag,Base> Params;
typedef Named_function_parameters<T,Tag,Base> Params;
return Params();
}
// define free functions for named parameters
#define CGAL_add_named_parameter(X, Y, Z) \
template <typename K> \
cgal_bgl_named_params<K, internal_np::X> \
Named_function_parameters<K, internal_np::X> \
Z(K const& p) \
{ \
typedef cgal_bgl_named_params<K, internal_np::X> Params;\
typedef Named_function_parameters<K, internal_np::X> Params;\
return Params(p); \
}
#include <CGAL/boost/graph/parameters_interface.h>
@ -198,7 +198,7 @@ inline no_parameters(cgal_bgl_named_params<T,Tag,Base>)
// function to extract a parameter
template <typename T, typename Tag, typename Base, typename Query_tag>
typename internal_np::Get_param<internal_np::Named_params_impl<T, Tag, Base>, Query_tag>::type
get_parameter(const cgal_bgl_named_params<T, Tag, Base>& np, Query_tag tag)
get_parameter(const Named_function_parameters<T, Tag, Base>& np, Query_tag tag)
{
return internal_np::get_parameter_impl(static_cast<const internal_np::Named_params_impl<T, Tag, Base>&>(np), tag);
}

8
BGL/include/CGAL/boost/graph/copy_face_graph.h
View File

@ -29,7 +29,7 @@
#include <CGAL/boost/graph/Euler_operations.h>
#include <CGAL/boost/graph/iterator.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/property_map.h>
#include <boost/unordered_map.hpp>
@ -328,8 +328,8 @@ template <typename SourceMesh, typename TargetMesh,
>
void copy_face_graph(const SourceMesh& sm, TargetMesh& tm,
#ifndef DOXYGEN_RUNNING
const CGAL::cgal_bgl_named_params<T1,Tag1,Base1>& np1,
const CGAL::cgal_bgl_named_params<T2,Tag2,Base2>& np2
const CGAL::Named_function_parameters<T1,Tag1,Base1>& np1,
const CGAL::Named_function_parameters<T2,Tag2,Base2>& np2
#else
const NamedParameters1& np1,
const NamedParameters2& np2
@ -361,7 +361,7 @@ void copy_face_graph(const SourceMesh& sm, TargetMesh& tm)
template <typename SourceMesh, typename TargetMesh,
typename T, typename Tag, typename Base >
void copy_face_graph(const SourceMesh& sm, TargetMesh& tm,
const CGAL::cgal_bgl_named_params<T,Tag,Base>& np)
const CGAL::Named_function_parameters<T,Tag,Base>& np)
{
copy_face_graph(sm, tm, np, parameters::all_default());
}

2
BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
View File

@ -23,7 +23,7 @@
#define CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H
// This will push/pop a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/version.hpp>
#include <climits>

2
BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
View File

@ -19,7 +19,7 @@
// Author(s) : Andreas Fabri, Philipp Moeller
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>

2
BGL/include/CGAL/boost/graph/io.h
View File

@ -33,7 +33,7 @@
#include <CGAL/boost/graph/Euler_operations.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
namespace CGAL {
/*!

6
BGL/include/CGAL/boost/graph/named_params_helper.h
View File

@ -19,7 +19,7 @@
#ifndef CGAL_BOOST_GRAPH_NAMED_PARAMETERS_HELPERS_H
#define CGAL_BOOST_GRAPH_NAMED_PARAMETERS_HELPERS_H
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/Origin.h>
@ -146,7 +146,7 @@ namespace CGAL {
};
template<typename PolygonMesh,
typename NamedParametersGT = cgal_bgl_named_params<bool, internal_np::all_default_t>,
typename NamedParametersGT = Named_function_parameters<bool, internal_np::all_default_t>,
typename NamedParametersVPM = NamedParametersGT >
class GetGeomTraits
{
@ -249,7 +249,7 @@ namespace CGAL {
namespace parameters
{
template <typename PointRange>
cgal_bgl_named_params<bool, internal_np::all_default_t>
Named_function_parameters<bool, internal_np::all_default_t>
inline all_default(const PointRange&)
{
return CGAL::parameters::all_default();

2
BGL/test/BGL/test_cgal_bgl_named_params.cpp
View File

@ -1,4 +1,4 @@
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/assertions.h>
#include <boost/type_traits/is_same.hpp>

2
HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
View File

@ -24,7 +24,7 @@
#include <functional>
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/config.hpp>
#include <boost/iterator/iterator_adaptor.hpp>

2
Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp
View File

@ -24,7 +24,7 @@
#include "IO.h"
#include <stdio.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
//== IMPLEMENTATION ===========================================================

14
Point_set_3/include/CGAL/Point_set_3.h
View File

@ -31,7 +31,7 @@
#include <CGAL/demangle.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
@ -855,13 +855,13 @@ public:
#ifdef DOXYGEN_RUNNING
unspecified_type
#else
cgal_bgl_named_params
Named_function_parameters
<typename Kernel_traits<Point>::Kernel,
internal_np::geom_traits_t,
cgal_bgl_named_params
Named_function_parameters
<typename CGAL::Point_set_3<Point, Vector>::template Property_map<Vector>,
internal_np::normal_t,
cgal_bgl_named_params
Named_function_parameters
<typename CGAL::Point_set_3<Point, Vector>::template Property_map<Point>,
internal_np::point_t> > >
#endif
@ -1198,13 +1198,13 @@ namespace Point_set_processing_3
namespace parameters
{
template <typename Point, typename Vector>
cgal_bgl_named_params
Named_function_parameters
<typename Kernel_traits<Point>::Kernel,
internal_np::geom_traits_t,
cgal_bgl_named_params
Named_function_parameters
<typename CGAL::Point_set_3<Point, Vector>::template Property_map<Vector>,
internal_np::normal_t,
cgal_bgl_named_params
Named_function_parameters
<typename CGAL::Point_set_3<Point, Vector>::template Property_map<Point>,
internal_np::point_t> > >
inline all_default(const CGAL::Point_set_3<Point, Vector>& ps)

2
Point_set_processing_3/include/CGAL/IO/read_las_points.h
View File

@ -35,7 +35,7 @@
#include <CGAL/point_set_processing_assertions.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/version.hpp>

2
Point_set_processing_3/include/CGAL/IO/read_off_points.h
View File

@ -31,7 +31,7 @@
#include <CGAL/point_set_processing_assertions.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iostream>

2
Point_set_processing_3/include/CGAL/IO/read_ply_points.h
View File

@ -36,7 +36,7 @@
#include <CGAL/Kernel_traits.h>
#include <CGAL/IO/io.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/version.hpp>

2
Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
View File

@ -30,7 +30,7 @@
#include <CGAL/Origin.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iostream>

2
Point_set_processing_3/include/CGAL/IO/write_ply_points.h
View File

@ -35,7 +35,7 @@
#include <CGAL/IO/read_ply_points.h>
#include <CGAL/Iterator_range.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/version.hpp>

2
Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
View File

@ -29,7 +29,7 @@
#include <CGAL/Kernel_traits.h>
#include <CGAL/Iterator_range.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iostream>

2
Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h
View File

@ -33,7 +33,7 @@
#include <CGAL/squared_distance_3.h>
#include <CGAL/function.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/compute_average_spacing.h
View File

@ -33,7 +33,7 @@
#include <CGAL/assertions.h>
#include <CGAL/function.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
View File

@ -32,7 +32,7 @@
#include <CGAL/Memory_sizer.h>
#include <CGAL/compute_average_spacing.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/estimate_scale.h
View File

@ -36,7 +36,7 @@
#include <CGAL/random_simplify_point_set.h>
#include <CGAL/Point_set_2.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <fstream>

2
Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
View File

@ -33,7 +33,7 @@
#include <CGAL/function.h>
#include <boost/functional/hash.hpp>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/hierarchy_simplify_point_set.h
View File

@ -41,7 +41,7 @@
#include <CGAL/Iterator_range.h>
#include <CGAL/function.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
namespace CGAL {

2
Point_set_processing_3/include/CGAL/jet_estimate_normals.h
View File

@ -34,7 +34,7 @@
#include <CGAL/Memory_sizer.h>
#include <CGAL/function.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
View File

@ -33,7 +33,7 @@
#include <CGAL/point_set_processing_assertions.h>
#include <CGAL/function.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/mst_orient_normals.h
View File

@ -35,7 +35,7 @@
#include <CGAL/point_set_processing_assertions.h>
#include <CGAL/use.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/pca_estimate_normals.h
View File

@ -35,7 +35,7 @@
#include <CGAL/Memory_sizer.h>
#include <CGAL/function.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/random_simplify_point_set.h
View File

@ -31,7 +31,7 @@
#include <CGAL/point_set_processing_assertions.h>
#include <CGAL/Iterator_range.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/remove_outliers.h
View File

@ -31,7 +31,7 @@
#include <CGAL/point_set_processing_assertions.h>
#include <CGAL/function.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <iterator>

2
Point_set_processing_3/include/CGAL/structure_point_set.h
View File

@ -42,7 +42,7 @@
#include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_3.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/iterator/counting_iterator.hpp>

2
Point_set_processing_3/include/CGAL/vcm_estimate_normals.h
View File

@ -38,7 +38,7 @@
#include <CGAL/Orthogonal_k_neighbor_search.h>
#include <CGAL/Fuzzy_sphere.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Default_diagonalize_traits.h>

2
Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h
View File

@ -32,7 +32,7 @@
#include <CGAL/Memory_sizer.h>
#include <CGAL/compute_average_spacing.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/algorithm.h>
#include <iterator>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
View File

@ -29,7 +29,7 @@
#include<set>
#include<vector>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/helpers.h>
#include <boost/graph/graph_traits.hpp>
#include <boost/foreach.hpp>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h
View File

@ -28,7 +28,7 @@
#include <CGAL/Polygon_mesh_processing/orientation.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/copy_face_graph.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/boost/graph/Euler_operations.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h
View File

@ -25,7 +25,7 @@
#include <CGAL/license/Polygon_mesh_processing/core.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#define CGAL_PMP_NP_TEMPLATE_PARAMETERS CGAL_BGL_NP_TEMPLATE_PARAMETERS
#define CGAL_PMP_NP_CLASS CGAL_BGL_NP_CLASS

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
View File

@ -1609,7 +1609,7 @@ OutputIterator intersecting_meshes(const TriangleMeshRange& range,
OutputIterator out,
NamedParameters np)
{
std::vector<cgal_bgl_named_params<bool, internal_np::all_default_t> >nps(
std::vector<Named_function_parameters<bool, internal_np::all_default_t> >nps(
std::distance(range.begin(), range.end()), parameters::all_default());
return intersecting_meshes(range, out, np, nps);
}

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
View File

@ -273,7 +273,7 @@ self_intersections(const TriangleMesh& tmesh
#ifdef DOXYGEN_RUNNING
, const NamedParameters& np)
#else
, const cgal_bgl_named_params<P,T,R>& np)
, const Named_function_parameters<P,T,R>& np)
#endif
{
return self_intersections(faces(tmesh), tmesh, out, np);

12
Polyhedron/demo/Polyhedron/include/Point_set_3.h
View File

@ -477,13 +477,13 @@ public:
bool are_radii_uptodate() const { return m_radii_are_uptodate; }
void set_radii_uptodate(bool /*on*/) { m_radii_are_uptodate = false; }
CGAL::cgal_bgl_named_params
CGAL::Named_function_parameters
<Kernel,
CGAL::internal_np::geom_traits_t,
CGAL::cgal_bgl_named_params
CGAL::Named_function_parameters
<typename Base::template Property_map<Vector>,
CGAL::internal_np::normal_t,
CGAL::cgal_bgl_named_params
CGAL::Named_function_parameters
<typename Base::template Property_map<Point>,
CGAL::internal_np::point_t> > >
inline parameters() const
@ -570,13 +570,13 @@ namespace Point_set_processing_3
namespace parameters
{
template <typename Kernel>
cgal_bgl_named_params
Named_function_parameters
<Kernel,
internal_np::geom_traits_t,
cgal_bgl_named_params
Named_function_parameters
<typename ::Point_set_3<Kernel>::template Property_map<typename Kernel::Vector_3>,
internal_np::normal_t,
cgal_bgl_named_params
Named_function_parameters
<typename ::Point_set_3<Kernel>::template Property_map<typename Kernel::Point_3>,
internal_np::point_t> > >
inline all_default(const ::Point_set_3<Kernel>& ps)

2
Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h
View File

@ -29,7 +29,7 @@
#include <CGAL/IO/print_OFF.h>
#include <CGAL/IO/scan_OFF.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <iostream>
namespace CGAL {

2
Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h
View File

@ -24,7 +24,7 @@
#include <CGAL/license/Polyhedron.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/property_map.h>
#include <boost/graph/graph_traits.hpp>

2
Scripts/developer_scripts/update_to_CGAL_np.sh
View File

@ -5,6 +5,8 @@ ack -l --cpp boost::param_not_found | xargs sed -i 's/boost::param_not_found/int
ack -l --cpp boost::is_default_param | xargs sed -i 's/boost::is_default_param/parameters::is_default_parameter/g'
ack -l --cpp boost::get_param | xargs sed -i 's/boost::get_param/parameters::get_parameter/g'
ack -l --cpp boost::choose_param | xargs sed -i 's/boost::choose_param/parameters::choose_parameter/g'
ack -l --cpp cgal_bgl_named_params | xargs sed -i 's/cgal_bgl_named_params/Named_function_parameters/g'
ack -l --cpp choose_param | xargs sed -i -E 's/choose_param[ ]*\(/choose_parameter(/g'
ack -l --cpp get_param | xargs sed -i -E 's/get_param[ ]*\(/get_parameter(/g'

2
Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h
View File

@ -31,7 +31,7 @@
#include <CGAL/circulator.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Subdivision_method_3/internal/subdivision_hosts_impl_3.h>

2
Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h
View File

@ -29,7 +29,7 @@
#include <CGAL/circulator.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Subdivision_method_3/subdivision_hosts_3.h>

2
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View File

@ -56,7 +56,7 @@
#include <CGAL/IO/File_scanner_OFF.h>
#include <CGAL/Handle_hash_function.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
namespace CGAL {

2
Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
View File

@ -26,7 +26,7 @@
#include <CGAL/license/Surface_mesh.h>
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/properties.hpp>

2
Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h
View File

@ -47,7 +47,7 @@
#endif
#include <CGAL/trace.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/version.hpp>
#ifdef CGAL_DO_NOT_USE_BOYKOV_KOLMOGOROV_MAXFLOW_SOFTWARE

6
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h
View File

@ -24,7 +24,7 @@
#include <CGAL/boost/graph/properties.h>
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h>
#include <CGAL/Surface_mesh_simplification/Detail/Common.h>
@ -102,7 +102,7 @@ struct Dummy_visitor
template<class TM, class ShouldStop, class P, class T, class R>
int edge_collapse ( TM& aSurface
, ShouldStop const& aShould_stop
, cgal_bgl_named_params<P,T,R> const& aParams
, Named_function_parameters<P,T,R> const& aParams
)
{
using parameters::choose_parameter;
@ -127,7 +127,7 @@ int edge_collapse ( TM& aSurface
template<class TM, class ShouldStop, class GT, class P, class T, class R>
int edge_collapse ( TM& aSurface
, ShouldStop const& aShould_stop
, cgal_bgl_named_params<P,T,R> const& aParams
, Named_function_parameters<P,T,R> const& aParams
)
{
using parameters::choose_parameter;

2
Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h
View File

@ -22,7 +22,7 @@
#define CGAL_GRAPH_TRAITS_CONSTRAINED_DELAUNAY_TRIANGULATION_2_H
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>

2
Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h
View File

@ -22,7 +22,7 @@
#define CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_2_H
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>

2
Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h
View File

@ -22,7 +22,7 @@
#define CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_PLUS_2_H
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>

2
Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
View File

@ -22,7 +22,7 @@
#define CGAL_GRAPH_TRAITS_DELAUNAY_TRIANGULATION_2_H
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>

2
Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h
View File

@ -22,7 +22,7 @@
#define CGAL_GRAPH_TRAITS_REGULAR_TRIANGULATION_2_H
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>

2
Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
View File

@ -24,7 +24,7 @@
#include <functional>
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>

2
Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
View File

@ -24,7 +24,7 @@
#include <functional>
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>

2
Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h
View File

@ -22,7 +22,7 @@
#define CGAL_GRAPH_TRAITS_TRIANGULATION_HIERARCHY_2_H
// include this to avoid a VC15 warning
#include <CGAL/boost/graph/named_function_params.h>
#include <CGAL/boost/graph/Named_function_parameters.h>
#include <boost/config.hpp>
#include <boost/iterator_adaptors.hpp>