Merge pull request #14946 from vespa-engine/vekterli/avoid-unsafe-functor-moving

Don't perform unsafe std::move of functor when it may be used again

1 files changed, 1 insertions, 17 deletions

diff --git a/storage/src/vespa/storage/common/content_bucket_space_repo.h b/storage/src/vespa/storage/common/content_bucket_space_repo.h
index 6d8bd67b071..1c858e47bcd 100644
--- a/storage/src/vespa/storage/common/content_bucket_space_repo.h
+++ b/storage/src/vespa/storage/common/content_bucket_space_repo.h
@@ -28,25 +28,9 @@ public:
     size_t getBucketMemoryUsage() const;
 
     template <typename Functor>
-    void forEachBucket(Functor &functor,
-                       const char *clientId) const {
-        for (const auto &elem : _map) {
-            elem.second->bucketDatabase().for_each(std::ref(functor), clientId);
-        }
-    }
-
-    template <typename Functor>
-    void forEachBucketChunked(Functor &functor,
-                              const char *clientId) const {
-        for (const auto &elem : _map) {
-            elem.second->bucketDatabase().for_each_chunked(std::ref(functor), clientId);
-        }
-    }
-
-    template <typename Functor>
     void for_each_bucket(Functor functor) const {
         for (const auto& elem : _map) {
-            elem.second->bucketDatabase().acquire_read_guard()->for_each(std::move(functor));
+            elem.second->bucketDatabase().acquire_read_guard()->for_each(functor);
         }
     }