update ceph source to reef 18.1.2

[ceph.git] / ceph / src / seastar / include / seastar / core / when_all.hh

diff --git a/ceph/src/seastar/include/seastar/core/when_all.hh b/ceph/src/seastar/include/seastar/core/when_all.hh
index 417273c171d0d807728c7e80e695a5923d6de152..97eb7e5d56e18657b8925a3f35402e6932a294b9 100644 (file)
--- a/ceph/src/seastar/include/seastar/core/when_all.hh
+++ b/ceph/src/seastar/include/seastar/core/when_all.hh
@@ -113,7 +113,7 @@ public:
             return true;
         } else {
             auto c = new (continuation) when_all_state_component(wasb, f);
-            set_callback(*f, c);
+            set_callback(std::move(*f), c);
             return false;
         }
     }
@@ -170,7 +170,8 @@ public:
         if ((futures.available() && ...)) {
             return ResolvedTupleTransform::make_ready_future(std::make_tuple(std::move(futures)...));
         }
-        auto state = [&, s = memory::scoped_critical_alloc_section()] () noexcept {
+        auto state = [&] () noexcept {
+            memory::scoped_critical_alloc_section _;
             return new when_all_state(std::move(futures)...);
         }();
         auto ret = state->p.get_future();