diff --git a/BGL/doc/BGL/PackageDescription.txt b/BGL/doc/BGL/PackageDescription.txt index 329e69e5906..84fb0f5d505 100644 --- a/BGL/doc/BGL/PackageDescription.txt +++ b/BGL/doc/BGL/PackageDescription.txt @@ -179,7 +179,7 @@ user might encounter. - `CGAL::Euler::add_vertex_and_face_to_border()` - `CGAL::Euler::add_face_to_border()` - `CGAL::Euler::collapse_edge()` -- `CGAL::Euler::satisfies_link_condition()` +- `CGAL::Euler::does_satisfy_link_condition()` */ diff --git a/BGL/include/CGAL/boost/graph/Euler_operations.h b/BGL/include/CGAL/boost/graph/Euler_operations.h index 5f463f8d186..664b6085755 100644 --- a/BGL/include/CGAL/boost/graph/Euler_operations.h +++ b/BGL/include/CGAL/boost/graph/Euler_operations.h @@ -1035,7 +1035,7 @@ add_face_to_border(typename boost::graph_traits::halfedge_descriptor h1, * * \returns vertex `vkept` (which can be either `v0` or `v1`). * \pre g must be a triangulated graph - * \pre `satisfies_link_condition(v0v1,g) == true`. + * \pre `does_satisfy_link_condition(v0v1,g) == true`. */ template typename boost::graph_traits::vertex_descriptor @@ -1349,7 +1349,7 @@ flip_edge(typename boost::graph_traits::halfedge_descriptor h, */ template bool - satisfies_link_condition(typename boost::graph_traits::edge_descriptor e, + does_satisfy_link_condition(typename boost::graph_traits::edge_descriptor e, Graph& g) { typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; @@ -1454,7 +1454,15 @@ bool return true ; } - +#ifndef CGAL_NO_DEPRECATED_CODE +template +bool + satisfies_link_condition(typename boost::graph_traits::edge_descriptor e, + Graph& g) +{ + return does_satisfy_link_condition(e, g); +} +#endif /// @} } // CGAL diff --git a/BGL/test/BGL/test_Euler_operations.cpp b/BGL/test/BGL/test_Euler_operations.cpp index 63a8969750a..1131fa70bbb 100644 --- a/BGL/test/BGL/test_Euler_operations.cpp +++ b/BGL/test/BGL/test_Euler_operations.cpp @@ -348,11 +348,11 @@ join_split_inverse() template void -satisfies_link_condition() +does_satisfy_link_condition() { Surface_fixture_7 f; - assert(CGAL::Euler::satisfies_link_condition(*edges(f.m).first,f.m)); + assert(CGAL::Euler::does_satisfy_link_condition(*edges(f.m).first,f.m)); } @@ -374,7 +374,7 @@ test_Euler_operations() make_hole_test(); remove_center_vertex_test(); join_split_inverse(); - satisfies_link_condition(); + does_satisfy_link_condition(); } int main() 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 26d2244c094..4c173e6ca82 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h @@ -310,7 +310,7 @@ std::size_t remove_degenerate_faces(TriangleMesh& tmesh, halfedge_descriptor h = halfedge(ed, tmesh); - if (CGAL::Euler::satisfies_link_condition(ed,tmesh)) + if (CGAL::Euler::does_satisfy_link_condition(ed,tmesh)) { // remove edges that could also be set for removal if ( face(h, tmesh)!=GT::null_face() ) @@ -553,7 +553,7 @@ std::size_t remove_degenerate_faces(TriangleMesh& tmesh, h=opposite(h, tmesh); ed=edge(h, tmesh); - } while(!CGAL::Euler::satisfies_link_condition(ed,tmesh)); + } while(!CGAL::Euler::does_satisfy_link_condition(ed,tmesh)); null_edges_to_remove.insert( ed ); #endif diff --git a/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h b/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h index c70142a90d2..8a0a6c0f874 100644 --- a/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h +++ b/Surface_mesh_skeletonization/include/CGAL/Mean_curvature_flow_skeletonization.h @@ -1377,7 +1377,7 @@ std::size_t Mean_curvature_flow_skeletonization