Added erase overload for const_iterator

Flast · Sep 15, 2024 · acd4685 · acd4685
1 parent 1af78d4
commit acd4685
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 0 deletions.
diff --git a/docs/flat_map.md b/docs/flat_map.md
@@ -515,6 +515,8 @@ Equivalent to `insert(hint, value_type(key, std::forward<Args>(args)...))` in th
 ```cpp
 iterator erase(iterator pos);
 
+iterator erase(const_iterator pos);
+
 iterator erase(const_iterator first, const_iterator last);
 
 size_type erase(key_type const& key)

diff --git a/docs/flat_multimap.md b/docs/flat_multimap.md
@@ -443,6 +443,8 @@ Equivalent to `insert(hint, value_type(std::forward<Args>(args)...))`.
 ```cpp
 iterator erase(iterator pos);
 
+iterator erase(const_iterator pos);
+
 iterator erase(const_iterator first, const_iterator last);
 
 size_type erase(key_type const& key)

diff --git a/docs/flat_multiset.md b/docs/flat_multiset.md
@@ -425,6 +425,8 @@ Equivalent to `insert(hint, value_type(std::forward<Args>(args)...))`.
 ```cpp
 iterator erase(iterator pos);
 
+iterator erase(const_iterator pos);
+
 iterator erase(const_iterator first, const_iterator last);
 
 size_type erase(key_type const& key)

diff --git a/docs/flat_set.md b/docs/flat_set.md
@@ -425,6 +425,8 @@ Equivalent to `insert(hint, value_type(std::forward<Args>(args)...))`.
 ```cpp
 iterator erase(iterator pos);
 
+iterator erase(const_iterator pos);
+
 iterator erase(const_iterator first, const_iterator last);
 
 size_type erase(key_type const& key)

diff --git a/flat_map/__binary_flat_tree.hpp b/flat_map/__binary_flat_tree.hpp
@@ -340,6 +340,7 @@ class _binary_flat_tree_base : private detail::comparator_store<Compare>
     iterator emplace_hint(const_iterator hint, Args&&... args) { return _insert(hint, value_type(std::forward<Args>(args)...)); }
 
     iterator erase(iterator pos) { return _container.erase(pos); }
+    iterator erase(const_iterator pos) { return _container.erase(pos); }
     iterator erase(const_iterator first, const_iterator last) { return _container.erase(first, last); }
 
     size_type erase(key_type const& key)

diff --git a/test/test_case/basic.ipp b/test/test_case/basic.ipp
@@ -994,6 +994,64 @@ TEST_CASE("insertion", "[insertion]")
 
 TEST_CASE("erase", "[erase]")
 {
+    SECTION("erase by iterator")
+    {
+        FLAT_CONTAINER<int, int> fm =
+        {
+            MAKE_PAIR(0, 1),
+            MAKE_PAIR(2, 3),
+            MAKE_PAIR(2, 8),
+            MAKE_PAIR(4, 5),
+            MAKE_PAIR(6, 7),
+        };
+
+#if MULTI_CONTAINER
+        REQUIRE(fm.erase(std::next(fm.begin())) != fm.end());
+        REQUIRE(fm.size() == 4);
+#else
+        REQUIRE(fm.erase(std::next(fm.begin())) != fm.end());
+        REQUIRE(fm.size() == 3);
+#endif
+
+        auto itr = fm.begin();
+        REQUIRE(*itr++ == MAKE_PAIR(0, 1));
+#if MULTI_CONTAINER
+        REQUIRE(*itr++ == MAKE_PAIR(2, 8));
+#endif
+        REQUIRE(*itr++ == MAKE_PAIR(4, 5));
+        REQUIRE(*itr++ == MAKE_PAIR(6, 7));
+        REQUIRE(itr == fm.end());
+    }
+
+    SECTION("erase by const_iterator")
+    {
+        FLAT_CONTAINER<int, int> fm =
+        {
+            MAKE_PAIR(0, 1),
+            MAKE_PAIR(2, 3),
+            MAKE_PAIR(2, 8),
+            MAKE_PAIR(4, 5),
+            MAKE_PAIR(6, 7),
+        };
+
+#if MULTI_CONTAINER
+        REQUIRE(fm.erase(std::next(fm.begin())) != fm.end());
+        REQUIRE(fm.size() == 4);
+#else
+        REQUIRE(fm.erase(std::next(fm.begin())) != fm.end());
+        REQUIRE(fm.size() == 3);
+#endif
+
+        auto itr = fm.begin();
+        REQUIRE(*itr++ == MAKE_PAIR(0, 1));
+#if MULTI_CONTAINER
+        REQUIRE(*itr++ == MAKE_PAIR(2, 8));
+#endif
+        REQUIRE(*itr++ == MAKE_PAIR(4, 5));
+        REQUIRE(*itr++ == MAKE_PAIR(6, 7));
+        REQUIRE(itr == fm.end());
+    }
+
     SECTION("erase by key")
     {
         FLAT_CONTAINER<int, int> fm =