From 1b7a2eb2c58fdefac3dbabff2df2439c03945472 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Wed, 12 Dec 2018 10:42:31 +0100 Subject: [PATCH] Replace cancel_removal() by cancel_removals() --- Point_set_3/include/CGAL/Point_set_3.h | 8 ++++---- Polyhedron/demo/Polyhedron/include/Point_set_3.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Point_set_3/include/CGAL/Point_set_3.h b/Point_set_3/include/CGAL/Point_set_3.h index 052363498b8..edef837243c 100644 --- a/Point_set_3/include/CGAL/Point_set_3.h +++ b/Point_set_3/include/CGAL/Point_set_3.h @@ -562,7 +562,7 @@ public: \note The elements are just marked as removed and are not erased from the memory. `collect_garbage()` should be called if the memory needs to be disallocated. Elements can be recovered with - `cancel_removal()`. + `cancel_removals()`. \note All iterators, pointers and references related to the container are invalidated. @@ -601,7 +601,7 @@ public: \note The element is just marked as removed and is not erased from the memory. `collect_garbage()` should be called if the memory needs to be freed. The element can be recovered with - `cancel_removal()`. + `cancel_removals()`. \note The `end()` iterator is invalidated, `it` dereferences to a different element. @@ -618,7 +618,7 @@ public: \note The element is just marked as removed and is not erased from the memory. `collect_garbage()` should be called if the memory needs to be freed. The element can be recovered with - `cancel_removal()`. + `cancel_removals()`. \note The `end()` iterator is invalidated, `it` dereferences to a different element. @@ -725,7 +725,7 @@ public: \note If `collect_garbage()` was called after removal, the points are irremediably lost and nothing will be restored. */ - void cancel_removal() + void cancel_removals() { m_nb_removed = 0; for (std::size_t i = 0; i < this->m_base.size(); ++ i) diff --git a/Polyhedron/demo/Polyhedron/include/Point_set_3.h b/Polyhedron/demo/Polyhedron/include/Point_set_3.h index 7afa0c01877..6b950dff12a 100644 --- a/Polyhedron/demo/Polyhedron/include/Point_set_3.h +++ b/Polyhedron/demo/Polyhedron/include/Point_set_3.h @@ -138,7 +138,7 @@ public: void reset_indices() { - this->cancel_removal(); + this->cancel_removals(); } bool add_radius()