Merge pull request #3131 from STEllAR-GROUP/fixing_2325

Fixing #2325
STEllAR-GROUP · Feb 1, 2018 · 4b7761f · 4b7761f
2 parents 4df531c + 18ab243
commit 4b7761f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/hpx/lcos/dataflow.hpp b/hpx/lcos/dataflow.hpp
@@ -57,7 +57,7 @@ namespace hpx { namespace lcos { namespace detail
 #if defined(HPX_HAVE_CXX14_RETURN_TYPE_DEDUCTION)
         static auto error(F f, Args args)
         {
-            hpx::util::invoke_fused(std::move(f), std::move(args));
+            return hpx::util::invoke_fused(std::move(f), std::move(args));
         }
 #else
         static auto error(F f, Args args)

diff --git a/hpx/parallel/util/scan_partitioner.hpp b/hpx/parallel/util/scan_partitioner.hpp
@@ -107,7 +107,7 @@ namespace hpx { namespace parallel { namespace util
                         finalitems.reserve(size + 1);
 
                         hpx::shared_future<Result1> curr = workitems[1];
-                        finalitems.push_back(dataflow(hpx::launch::sync,
+                        finalitems.push_back(dataflow(policy.executor(),
                             f3, first_, count_ - count, workitems[0], curr));
 
                         workitems[1] = dataflow(hpx::launch::sync,
@@ -131,7 +131,7 @@ namespace hpx { namespace parallel { namespace util
                         auto curr = execution::async_execute(
                             policy.executor(), f1, it, size).share();
 
-                        finalitems.push_back(dataflow(hpx::launch::sync,
+                        finalitems.push_back(dataflow(policy.executor(),
                             f3, it, size, prev, curr));
 
                         workitems.push_back(dataflow(hpx::launch::sync,
@@ -250,7 +250,7 @@ namespace hpx { namespace parallel { namespace util
                     {
                         HPX_ASSERT(count_ > count);
 
-                        finalitems.push_back(dataflow(hpx::launch::sync,
+                        finalitems.push_back(dataflow(policy.executor(),
                             f3, first_, count_ - count,
                             workitems[0], workitems[1]));
                     }
@@ -260,7 +260,7 @@ namespace hpx { namespace parallel { namespace util
                         FwdIter it = hpx::util::get<0>(elem);
                         std::size_t size = hpx::util::get<1>(elem);
 
-                        finalitems.push_back(dataflow(hpx::launch::sync,
+                        finalitems.push_back(dataflow(policy.executor(),
                             f3, it, size, workitems[0], workitems[1]));
                     }
 
@@ -279,7 +279,7 @@ namespace hpx { namespace parallel { namespace util
                         // Wait the completion of f3 on previous partition.
                         finalitems.back().wait();
 
-                        finalitems.push_back(dataflow(hpx::launch::sync,
+                        finalitems.push_back(dataflow(policy.executor(),
                             f3, it, size,
                             workitems[widx], workitems[widx + 1]));
                     }