Merge pull request #9 from elbeno/fix-cx-multimap

🐛 Fix cx_multimap erase
intel · Sep 13, 2023 · 9cf1f58 · 9cf1f58
2 parents 68de4cc + 5e68eec
commit 9cf1f58
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/include/stdx/cx_multimap.hpp b/include/stdx/cx_multimap.hpp
@@ -68,9 +68,9 @@ class cx_multimap {
     constexpr auto erase(key_type const &k, mapped_type const &v) -> size_type {
         if (storage.contains(k)) {
             auto &s = storage.get(k);
-            auto const r = s.remove(v);
+            auto const r = s.erase(v);
             if (s.empty()) {
-                storage.remove(k);
+                storage.erase(k);
             }
             return r;
         }

diff --git a/test/cx_multimap.cpp b/test/cx_multimap.cpp
@@ -45,6 +45,21 @@ TEST_CASE("put multiple values", "[cx_multimap]") {
     CHECK(not t.contains(60, 0));
 }
 
+TEST_CASE("erase values", "[cx_multimap]") {
+    stdx::cx_multimap<int, int, 64> t;
+
+    t.put(60, 1);
+    t.put(60, 2);
+    t.put(60, 3);
+
+    t.erase(60, 2);
+    CHECK(t.size() == 1);
+    CHECK(not t.contains(60, 2));
+
+    t.erase(60);
+    CHECK(t.empty());
+}
+
 TEST_CASE("constexpr populated map", "[cx_multimap]") {
     constexpr auto m = [] {
         stdx::cx_multimap<int, int, 64> t;