fixup. cache

Author: knelli2

src/Parallel/GlobalCache.hpp

@@ -488,7 +488,7 @@ bool GlobalCache<Metavariables>::mutable_cache_item_is_ready(
     optional_callback->register_with_charm();
     // Second mutex is for vector of callbacks
     std::mutex& mutex = tuples::get<MutexTag<tag>>(mutexes_).second;
-    std::unique_ptr<Callback> clone_of_optional_callback =
+    const std::unique_ptr<Callback> clone_of_optional_callback =
         optional_callback->get_clone();
     {
       // Scoped for lock guard
@@ -559,20 +559,17 @@ bool GlobalCache<Metavariables>::mutable_cache_item_is_ready(
       // It's possible that no new callbacks were registered, so make sure this
       // array component id still has callbacks before trying to remove them.
       if (callbacks.contains(array_component_id)) {
+        // If this callback was a duplicate, we'll have to search through all
+        // callbacks to determine which to remove. If it wasn't a duplicate,
+        // then it'll just be the last callback in the vector.
+        auto& vec_callbacks = callbacks.at(array_component_id);
+        std::erase_if(vec_callbacks,
+                      [&clone_of_optional_callback](const auto& t) {
+                        return t->is_equal_to(*clone_of_optional_callback);
+                      });
+
         if (callbacks.at(array_component_id).empty()) {
           callbacks.erase(array_component_id);
-        } else {
-          // If this callback was a duplicate, we'll have to search through all
-          // callbacks to determine which to remove. If it wasn't a dupliate,
-          // then it'll just be the last callback in the vector.
-          auto& vec_callbacks = callbacks.at(array_component_id);
-          auto it_to_erase = vec_callbacks.begin();
-          for (; it_to_erase != vec_callbacks.end(); it_to_erase++) {
-            if ((*it_to_erase)->is_equal_to(*clone_of_optional_callback)) {
-              vec_callbacks.erase(it_to_erase);
-              break;
-            }
-          }
         }
       }
     }