From 2fee4affddcf7cda6969cc69a905fcfd765c233e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 10 Feb 2017 17:00:38 +0100 Subject: [PATCH] rename macro to be independant of any package --- .../boost/graph/boost_parameters_interface.h | 6 +-- .../CGAL/boost/graph/named_function_params.h | 20 +++---- .../CGAL/boost/graph/parameters_interface.h | 20 +++---- .../internal/named_function_params.h | 20 +++---- .../internal/parameters_interface.h | 52 +++++++++---------- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/BGL/include/CGAL/boost/graph/boost_parameters_interface.h b/BGL/include/CGAL/boost/graph/boost_parameters_interface.h index 42ec5629788..851fccde3c4 100644 --- a/BGL/include/CGAL/boost/graph/boost_parameters_interface.h +++ b/BGL/include/CGAL/boost/graph/boost_parameters_interface.h @@ -19,6 +19,6 @@ -CGAL_add_pmp_parameter(vertex_index_t, vertex_index_map, vertex_index_map) -CGAL_add_pmp_parameter(edge_index_t, edge_index_map, edge_index_map) -CGAL_add_pmp_parameter(graph_visitor_t, visitor, visitor) +CGAL_add_named_parameter(vertex_index_t, vertex_index_map, vertex_index_map) +CGAL_add_named_parameter(edge_index_t, edge_index_map, edge_index_map) +CGAL_add_named_parameter(graph_visitor_t, visitor, visitor) diff --git a/BGL/include/CGAL/boost/graph/named_function_params.h b/BGL/include/CGAL/boost/graph/named_function_params.h index e3ccad4ba90..5732b386de4 100644 --- a/BGL/include/CGAL/boost/graph/named_function_params.h +++ b/BGL/include/CGAL/boost/graph/named_function_params.h @@ -104,10 +104,10 @@ namespace boost{ namespace CGAL { namespace parameters{ -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#define CGAL_add_named_parameter(X, Y, Z) \ enum X { Y }; #include -#undef CGAL_add_pmp_parameter +#undef CGAL_add_named_parameter }//parameters template @@ -120,7 +120,7 @@ namespace parameters{ cgal_bgl_named_params(T v, const Base& b) : base(v, b) {} -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#define CGAL_add_named_parameter(X, Y, Z) \ template \ cgal_bgl_named_params \ Z(const K& k) const \ @@ -129,9 +129,9 @@ namespace parameters{ return Params(k, *this); \ } #include -#undef CGAL_add_pmp_parameter +#undef CGAL_add_named_parameter -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#define CGAL_add_named_parameter(X, Y, Z) \ template \ cgal_bgl_named_params \ Z(const K& k) const \ @@ -140,12 +140,12 @@ namespace parameters{ return Params(k, *this); \ } #include -#undef CGAL_add_pmp_parameter +#undef CGAL_add_named_parameter }; namespace parameters { -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#define CGAL_add_named_parameter(X, Y, Z) \ template \ cgal_bgl_named_params \ Z(K const& p) \ @@ -154,9 +154,9 @@ namespace parameters{ return Params(p); \ } #include -#undef CGAL_add_pmp_parameter +#undef CGAL_add_named_parameter -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#define CGAL_add_named_parameter(X, Y, Z) \ template \ cgal_bgl_named_params \ Z(K const& p) \ @@ -165,7 +165,7 @@ namespace parameters{ return Params(p); \ } #include -#undef CGAL_add_pmp_parameter +#undef CGAL_add_named_parameter } // namespace parameters diff --git a/BGL/include/CGAL/boost/graph/parameters_interface.h b/BGL/include/CGAL/boost/graph/parameters_interface.h index d96d087136b..9b67b2cc033 100644 --- a/BGL/include/CGAL/boost/graph/parameters_interface.h +++ b/BGL/include/CGAL/boost/graph/parameters_interface.h @@ -17,13 +17,13 @@ // // Author(s) : Maxime Gimeno -CGAL_add_pmp_parameter(vertex_point_t, vertex_point_map, vertex_point_map) -CGAL_add_pmp_parameter(face_index_t, face_index_map, face_index_map) -CGAL_add_pmp_parameter(halfedge_index_t, halfedge_index_map, halfedge_index_map) -CGAL_add_pmp_parameter(edge_is_constrained_t, edge_is_constrained, edge_is_constrained_map) -CGAL_add_pmp_parameter(edge_is_constrained_params_t, edge_is_constrained_params, edge_is_constrained_map_params) -CGAL_add_pmp_parameter(set_cache_policy_t, set_cache_policy, set_cache) -CGAL_add_pmp_parameter(get_cost_policy_t, get_cost_policy, get_cost) -CGAL_add_pmp_parameter(get_cost_policy_params_t, get_cost_policy_params, get_cost_params) -CGAL_add_pmp_parameter(get_placement_policy_t, get_placement_policy, get_placement) -CGAL_add_pmp_parameter(get_placement_policy_params_t, get_placement_policy_params, get_placement_params) +CGAL_add_named_parameter(vertex_point_t, vertex_point_map, vertex_point_map) +CGAL_add_named_parameter(face_index_t, face_index_map, face_index_map) +CGAL_add_named_parameter(halfedge_index_t, halfedge_index_map, halfedge_index_map) +CGAL_add_named_parameter(edge_is_constrained_t, edge_is_constrained, edge_is_constrained_map) +CGAL_add_named_parameter(edge_is_constrained_params_t, edge_is_constrained_params, edge_is_constrained_map_params) +CGAL_add_named_parameter(set_cache_policy_t, set_cache_policy, set_cache) +CGAL_add_named_parameter(get_cost_policy_t, get_cost_policy, get_cost) +CGAL_add_named_parameter(get_cost_policy_params_t, get_cost_policy_params, get_cost_params) +CGAL_add_named_parameter(get_placement_policy_t, get_placement_policy, get_placement) +CGAL_add_named_parameter(get_placement_policy_params_t, get_placement_policy_params, get_placement_params) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h index 46cbe80d9d8..56e1794ce7a 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h @@ -32,12 +32,12 @@ namespace CGAL{ namespace parameters{ enum all_default_t { all_default }; //cannot use macro because it takes no argument -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#define CGAL_add_named_parameter(X, Y, Z) \ enum X { Y }; #include -#undef CGAL_add_pmp_parameter +#undef CGAL_add_named_parameter }//parameters template struct pmp_bgl_named_params @@ -54,7 +54,7 @@ enum all_default_t { all_default }; //cannot use macro because it takes no argum typedef pmp_bgl_named_params Params; return Params(*this); } -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#define CGAL_add_named_parameter(X, Y, Z) \ template \ pmp_bgl_named_params \ Z(const K& k) const \ @@ -65,8 +65,8 @@ enum all_default_t { all_default }; //cannot use macro because it takes no argum #include #include -#undef CGAL_add_pmp_parameter -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#undef CGAL_add_named_parameter +#define CGAL_add_named_parameter(X, Y, Z) \ template \ pmp_bgl_named_params \ Z(const K& k) const \ @@ -75,7 +75,7 @@ enum all_default_t { all_default }; //cannot use macro because it takes no argum return Params(k, *this); \ } #include -#undef CGAL_add_pmp_parameter +#undef CGAL_add_named_parameter }; namespace Polygon_mesh_processing{ @@ -98,7 +98,7 @@ pmp_bgl_named_params return Params(); } -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#define CGAL_add_named_parameter(X, Y, Z) \ template \ pmp_bgl_named_params \ Z(const K& k) \ @@ -108,8 +108,8 @@ pmp_bgl_named_params } #include #include -#undef CGAL_add_pmp_parameter -#define CGAL_add_pmp_parameter(X, Y, Z) \ +#undef CGAL_add_named_parameter +#define CGAL_add_named_parameter(X, Y, Z) \ template \ pmp_bgl_named_params \ Z(const K& k) \ @@ -118,7 +118,7 @@ pmp_bgl_named_params return Params(k); \ } #include -#undef CGAL_add_pmp_parameter +#undef CGAL_add_named_parameter } //namespace parameters } //namespace Polygon_mesh_processing diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/parameters_interface.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/parameters_interface.h index ef1fcb2bd6a..50de714155d 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/parameters_interface.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/parameters_interface.h @@ -18,32 +18,32 @@ // // Author(s) : Maxime Gimeno -CGAL_add_pmp_parameter(geom_traits_t, geom_traits, geom_traits) -CGAL_add_pmp_parameter(density_control_factor_t, density_control_factor, density_control_factor) -CGAL_add_pmp_parameter(use_delaunay_triangulation_t, use_delaunay_triangulation, use_delaunay_triangulation) -CGAL_add_pmp_parameter(fairing_continuity_t, fairing_continuity, fairing_continuity) -CGAL_add_pmp_parameter(sparse_linear_solver_t, sparse_linear_solver, sparse_linear_solver) -CGAL_add_pmp_parameter(number_of_iterations_t, number_of_iterations, number_of_iterations) -CGAL_add_pmp_parameter(number_of_relaxation_steps_t, number_of_relaxation_steps, number_of_relaxation_steps) -CGAL_add_pmp_parameter(protect_constraints_t, protect_constraints, protect_constraints) -CGAL_add_pmp_parameter(relax_constraints_t, relax_constraints, relax_constraints) -CGAL_add_pmp_parameter(vertex_is_constrained_t, vertex_is_constrained, vertex_is_constrained_map) -CGAL_add_pmp_parameter(face_patch_t, face_patch, face_patch_map) -CGAL_add_pmp_parameter(random_uniform_sampling_t, random_uniform_sampling, random_uniform_sampling) -CGAL_add_pmp_parameter(grid_sampling_t, grid_sampling, grid_sampling) -CGAL_add_pmp_parameter(monte_carlo_sampling_t, monte_carlo_sampling, monte_carlo_sampling) -CGAL_add_pmp_parameter(do_sample_edges_t, do_sample_edges, do_sample_edges) -CGAL_add_pmp_parameter(do_sample_vertices_t, do_sample_vertices, do_sample_vertices) -CGAL_add_pmp_parameter(do_sample_faces_t, do_sample_faces, do_sample_faces) -CGAL_add_pmp_parameter(number_of_points_on_faces_t, number_of_points_on_faces, number_of_points_on_faces) -CGAL_add_pmp_parameter(number_of_points_per_face_t, number_of_points_per_face, number_of_points_per_face) -CGAL_add_pmp_parameter(grid_spacing_t, grid_spacing, grid_spacing) -CGAL_add_pmp_parameter(number_of_points_per_edge_t, number_of_points_per_edge, number_of_points_per_edge) -CGAL_add_pmp_parameter(number_of_points_on_edges_t, number_of_points_on_edges, number_of_points_on_edges) -CGAL_add_pmp_parameter(nb_points_per_area_unit_t, nb_points_per_area_unit, number_of_points_per_area_unit) -CGAL_add_pmp_parameter(nb_points_per_distance_unit_t, nb_points_per_distance_unit, number_of_points_per_distance_unit) +CGAL_add_named_parameter(geom_traits_t, geom_traits, geom_traits) +CGAL_add_named_parameter(density_control_factor_t, density_control_factor, density_control_factor) +CGAL_add_named_parameter(use_delaunay_triangulation_t, use_delaunay_triangulation, use_delaunay_triangulation) +CGAL_add_named_parameter(fairing_continuity_t, fairing_continuity, fairing_continuity) +CGAL_add_named_parameter(sparse_linear_solver_t, sparse_linear_solver, sparse_linear_solver) +CGAL_add_named_parameter(number_of_iterations_t, number_of_iterations, number_of_iterations) +CGAL_add_named_parameter(number_of_relaxation_steps_t, number_of_relaxation_steps, number_of_relaxation_steps) +CGAL_add_named_parameter(protect_constraints_t, protect_constraints, protect_constraints) +CGAL_add_named_parameter(relax_constraints_t, relax_constraints, relax_constraints) +CGAL_add_named_parameter(vertex_is_constrained_t, vertex_is_constrained, vertex_is_constrained_map) +CGAL_add_named_parameter(face_patch_t, face_patch, face_patch_map) +CGAL_add_named_parameter(random_uniform_sampling_t, random_uniform_sampling, random_uniform_sampling) +CGAL_add_named_parameter(grid_sampling_t, grid_sampling, grid_sampling) +CGAL_add_named_parameter(monte_carlo_sampling_t, monte_carlo_sampling, monte_carlo_sampling) +CGAL_add_named_parameter(do_sample_edges_t, do_sample_edges, do_sample_edges) +CGAL_add_named_parameter(do_sample_vertices_t, do_sample_vertices, do_sample_vertices) +CGAL_add_named_parameter(do_sample_faces_t, do_sample_faces, do_sample_faces) +CGAL_add_named_parameter(number_of_points_on_faces_t, number_of_points_on_faces, number_of_points_on_faces) +CGAL_add_named_parameter(number_of_points_per_face_t, number_of_points_per_face, number_of_points_per_face) +CGAL_add_named_parameter(grid_spacing_t, grid_spacing, grid_spacing) +CGAL_add_named_parameter(number_of_points_per_edge_t, number_of_points_per_edge, number_of_points_per_edge) +CGAL_add_named_parameter(number_of_points_on_edges_t, number_of_points_on_edges, number_of_points_on_edges) +CGAL_add_named_parameter(nb_points_per_area_unit_t, nb_points_per_area_unit, number_of_points_per_area_unit) +CGAL_add_named_parameter(nb_points_per_distance_unit_t, nb_points_per_distance_unit, number_of_points_per_distance_unit) //to be documented -CGAL_add_pmp_parameter(face_normal_t, face_normal, face_normal_map) +CGAL_add_named_parameter(face_normal_t, face_normal, face_normal_map) //internal -CGAL_add_pmp_parameter(weight_calculator_t, weight_calculator, weight_calculator) +CGAL_add_named_parameter(weight_calculator_t, weight_calculator, weight_calculator)