diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h index b74fa4a8c16..2e6a53b63fd 100644 --- a/BGL/include/CGAL/boost/graph/named_params_helper.h +++ b/BGL/include/CGAL/boost/graph/named_params_helper.h @@ -316,7 +316,7 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits::fa {} template - void operator()(const T&) const + void visit(const T&) const {} void done() const diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp index 77d302d96e2..1fbfe9d0a0a 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp @@ -42,7 +42,8 @@ public: }; -struct Visitor { +struct Visitor +{ typedef boost::unordered_map Container; Container& container; @@ -60,7 +61,7 @@ struct Visitor { container.erase(it); } - void operator()(face_descriptor fd) + void visit(face_descriptor fd) { std::cout << " " << fd; container[fd]=qfd; 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 a35056271ad..9f9fbcddb4f 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 @@ -127,8 +127,8 @@ public: { res = CGAL::Euler::split_face(v1, v3, pmesh); } - visitor(face(res,pmesh)); - visitor(face(opposite(res,pmesh),pmesh)); + visitor.visit(face(res,pmesh)); + visitor.visit(face(opposite(res,pmesh),pmesh)); visitor.done(); } else @@ -276,7 +276,7 @@ public: set_next(h2, h0, pmesh); Euler::fill_hole(h0, pmesh); - visitor(face(h0, pmesh)); + visitor.visit(face(h0, pmesh)); } } visitor.done(); @@ -327,8 +327,8 @@ public: first=false; else f=add_face(pmesh); - visitor(f); - + visitor.visit(f); + std::array indices = make_array( triangle.first, triangle.second, @@ -458,12 +458,12 @@ bool triangulate_face(typename boost::graph_traits::face_descriptor //Option bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_delaunay_triangulation), true); - + typedef typename GetSplitVisitor::type SplitVisitor; typedef typename GetSplitVisitor::DummySplitVisitor DummySplitVisitor; SplitVisitor visitor = choose_param(get_param(np, internal_np::split_visitor), DummySplitVisitor()); - + internal::Triangulate_modifier modifier(vpmap); return modifier.triangulate_face(f, pmesh, use_cdt, visitor); }