Rename remove to erase in subscription_map, for multiple_subscription_map return the number of elements that were removed

Author: kleunen

test/subscription_map.cpp

@@ -255,7 +255,7 @@ BOOST_AUTO_TEST_CASE( multi_non_wc_crud ) {
         auto& idx = scos.get<tag_con_topic_filter>();
         auto it = idx.find(std::make_tuple(con1, "a/b/c"_mb));
         BOOST_TEST((it != idx.end()));
-        m.remove(it->h, *it);
+        m.erase(it->h, *it);
         idx.erase(it);
         m.find(
             "a/b/c",
@@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE( multi_non_wc_crud ) {
             auto const& elem = *it;
             // call remove for each handle - Value pairs
             // it is a little inefficient but still enough efficient
-            m.remove(elem.h, elem);
+            m.erase(elem.h, elem);
             ++it;
         }
         idx.erase(r.first, r.second);
@@ -435,7 +435,7 @@ BOOST_AUTO_TEST_CASE( multi_wc_crud ) {
         auto& idx = scos.get<tag_con_topic_filter>();
         auto it = idx.find(std::make_tuple(con1, "a/+/c"_mb));
         BOOST_TEST((it != idx.end()));
-        m.remove(it->h, *it);
+        m.erase(it->h, *it);
         idx.erase(it);
         m.find(
             "a/b/c",
@@ -471,7 +471,7 @@ BOOST_AUTO_TEST_CASE( multi_wc_crud ) {
             auto const& elem = *it;
             // call remove for each handle - Value pairs
             // it is a little inefficient but still enough efficient
-            m.remove(elem.h, elem);
+            m.erase(elem.h, elem);
             ++it;
         }
         idx.erase(r.first, r.second);

test/subscription_map.hpp

@@ -337,7 +337,7 @@ class single_subscription_map
     }
 
     // Remove a value at the specified subscription path
-    void remove(MQTT_NS::string_view subscription) {
+    void erase(MQTT_NS::string_view subscription) {
         auto path = this->find_subscription(subscription);
         if (path.empty()) {
             return;
@@ -347,7 +347,7 @@ class single_subscription_map
     }
 
     // Remove a value using a handle
-    void remove(handle h) {
+    void erase(handle h) {
         auto path = this->handle_to_iterators(h);
         if (!path.empty()) {
             this->remove_subscription(path);
@@ -399,12 +399,12 @@ class multiple_subscription_map
 
         auto& subscription_set = h_iter->second.value;
         bool insert_result = subscription_set.insert(std::move(value)).second;
-        return std::make_pair(this->path_to_handle(path), insert_result);
+        return std::make_pair(h, insert_result);
     }
 
     // Remove a value at the specified subscription path
     // returns the value of the removed element (if found)
-    boost::optional<Value> remove(MQTT_NS::string_view subscription, Value const& value) {
+    size_t remove(MQTT_NS::string_view subscription, Value const& value) {
         // Find the subscription in the map
         auto path = this->find_subscription(subscription);
         if (path.empty()) {
@@ -413,25 +413,12 @@ class multiple_subscription_map
 
         // Remove the specified value
         auto& subscription_set = path.back()->second.value;
-        auto subscription_iter = subscription_set.find(value);
-        if (subscription_iter != subscription_set.end()) {
-            auto result = boost::make_optional(*subscription_iter);
-            subscription_set.erase(subscription_iter);
-
-            // Remove the subscription when all entries are removed
-            if (subscription_set.empty()) {
-                this->remove_subscription(path);
-            }
-
-            return result;
-        }
-
-        return boost::optional<Value>();
+        return subscription_set.erase(value);
     }
 
     // Remove a value at the specified handle
     // returns the value of the removed element (if found)
-    boost::optional<Value> remove(handle h, Value const& value) {
+    size_t erase(handle h, Value const& value) {
         if (h.empty()) {
             throw std::runtime_error("Invalid handle was specified");
         }
@@ -443,20 +430,7 @@ class multiple_subscription_map
         }
 
         auto& subscription_set = h_iter->second.value;
-        auto subscription_iter = subscription_set.find(value);
-        if (subscription_iter != subscription_set.end()) {
-            auto result = boost::make_optional(*subscription_iter);
-            subscription_set.erase(subscription_iter);
-
-            // Remove the subscription when all entries are removed
-            if (subscription_set.empty()) {
-                this->remove_subscription(this->handle_to_iterators(h));
-            }
-
-            return result;
-        }
-
-        return boost::optional<Value>();
+        return subscription_set.erase(value);
     }
 
         // Find all subscriptions that match the specified topic