import quincy beta 17.1.0

[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 03315d3eba23bd23e4dd7e02de40d39216966e89..417273c171d0d807728c7e80e695a5923d6de152 100644 (file)
--- a/ceph/src/seastar/include/seastar/core/when_all.hh
+++ b/ceph/src/seastar/include/seastar/core/when_all.hh
@@ -27,6 +27,7 @@
 #include <type_traits>
 
 #include <seastar/core/future.hh>
+#include <seastar/core/loop.hh>
 #include <seastar/util/tuple_utils.hh>
 #include <seastar/util/critical_alloc_section.hh>
 
@@ -169,8 +170,7 @@ public:
         if ((futures.available() && ...)) {
             return ResolvedTupleTransform::make_ready_future(std::make_tuple(std::move(futures)...));
         }
-        auto state = [&] () noexcept {
-            memory::scoped_critical_alloc_section _;
+        auto state = [&, s = memory::scoped_critical_alloc_section()] () noexcept {
             return new when_all_state(std::move(futures)...);
         }();
         auto ret = state->p.get_future();