Adapt broadcast() to non-unwrapping async<Action>

This fixes #2885
STEllAR-GROUP · Sep 6, 2017 · fae416b · fae416b
1 parent 3542836
commit fae416b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/hpx/lcos/broadcast.hpp b/hpx/lcos/broadcast.hpp
@@ -506,7 +506,9 @@ namespace hpx { namespace lcos
         std::vector<Result>
         wrap_into_vector(hpx::future<Result> r)
         {
-            return std::vector<Result>(1, r.get());
+            std::vector<Result> result;
+            result.push_back(r.get());
+            return result;
         }
 
         template <

diff --git a/tests/regressions/lcos/CMakeLists.txt b/tests/regressions/lcos/CMakeLists.txt
@@ -11,6 +11,7 @@ set(tests
     async_callback_non_deduced_context
     async_unwrap_1037
     barrier_hang
+    broadcast_unwrap_future_2885
     broadcast_wait_for_2822
     call_promise_get_gid_more_than_once
     channel_register_as_2722
@@ -60,6 +61,7 @@ set(after_588_PARAMETERS LOCALITIES 2)
 set(async_action_1813_PARAMETERS LOCALITIES 2)
 set(async_callback_with_bound_callback_PARAMETERS LOCALITIES 2)
 set(async_callback_non_deduced_context_PARAMETERS THREADS_PER_LOCALITY 4)
+set(broadcast_unwrap_future_2885_PARAMETERS LOCALITIES 2 THREADS_PER_LOCALITY 4)
 set(broadcast_wait_for_2822_PARAMETERS LOCALITIES 2 THREADS_PER_LOCALITY 4)
 set(future_hang_on_get_629_PARAMETERS LOCALITIES 2 THREADS_PER_LOCALITY 2)
 set(dataflow_future_swap2_FLAGS DEPENDENCIES iostreams_component)