Fixing compilation errors

STEllAR-GROUP · Dec 5, 2017 · 765a12a · 765a12a
1 parent 6277759
commit 765a12a
Show file tree

Hide file tree

Showing 17 changed files with 194 additions and 182 deletions.
diff --git a/hpx/include/parallel_execution.hpp b/hpx/include/parallel_execution.hpp
@@ -8,6 +8,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/parallel/execution.hpp>
+#include <hpx/parallel/executors.hpp>
 
 #endif
 
diff --git a/hpx/lcos/dataflow.hpp b/hpx/lcos/dataflow.hpp
@@ -36,7 +36,6 @@
 #include <hpx/parallel/executors/v1/executor_traits.hpp>
 #endif
 #include <hpx/parallel/executors/execution.hpp>
-#include <hpx/parallel/executors/parallel_executor.hpp>
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/ref.hpp>

diff --git a/hpx/lcos/detail/future_transforms.hpp b/hpx/lcos/detail/future_transforms.hpp
@@ -6,7 +6,7 @@
 #ifndef HPX_LCOS_DETAIL_FUTURE_TRANSFORMS_HPP
 #define HPX_LCOS_DETAIL_FUTURE_TRANSFORMS_HPP
 
-#include <hpx/lcos/future.hpp>
+#include <hpx/lcos_fwd.hpp>
 #include <hpx/traits/acquire_future.hpp>
 #include <hpx/traits/acquire_shared_state.hpp>
 #include <hpx/traits/detail/reserve.hpp>

diff --git a/hpx/lcos/future.hpp b/hpx/lcos/future.hpp
@@ -10,6 +10,7 @@
 #include <hpx/config.hpp>
 #include <hpx/error_code.hpp>
 #include <hpx/lcos/detail/future_data.hpp>
+#include <hpx/lcos/detail/future_traits.hpp>
 #include <hpx/lcos_fwd.hpp>
 #include <hpx/runtime/actions/continuation_fwd.hpp>
 #include <hpx/runtime/serialization/detail/polymorphic_nonintrusive_factory.hpp>
@@ -300,24 +301,6 @@ namespace hpx { namespace lcos { namespace detail
         typedef future<result_type> type;
     };
 
-    ///////////////////////////////////////////////////////////////////////////
-    template <typename Iter, typename Enable = void>
-    struct future_iterator_traits
-    {};
-
-    template <typename Iterator>
-    struct future_iterator_traits<Iterator,
-        typename hpx::util::always_void<
-            typename std::iterator_traits<Iterator>::value_type
-        >::type>
-    {
-        typedef
-            typename std::iterator_traits<Iterator>::value_type
-            type;
-
-        typedef hpx::traits::future_traits<type> traits_type;
-    };
-
     ///////////////////////////////////////////////////////////////////////////
     template <typename T>
     struct future_value

diff --git a/hpx/lcos/local/packaged_continuation.hpp b/hpx/lcos/local/packaged_continuation.hpp
@@ -25,7 +25,7 @@
 #include <hpx/util/thread_description.hpp>
 
 #include <hpx/parallel/executors/execution.hpp>
-#include <hpx/parallel/executors/parallel_executor.hpp>
+#include <hpx/parallel/executors/post_policy_dispatch.hpp>
 
 #include <boost/intrusive_ptr.hpp>
 
@@ -323,10 +323,13 @@ namespace hpx { namespace lcos { namespace detail
                 typename traits::detail::shared_state_ptr_for<Future>::type &&
             ) = &continuation::async_impl;
 
-            parallel::execution::parallel_executor exec{
-                hpx::launch::async_policy{priority}};
-            parallel::execution::post(
-                exec, async_impl_ptr, std::move(this_), std::move(f));
+            hpx::util::thread_description desc(async_impl_ptr,
+                "hpx::parallel::execution::parallel_executor::post");
+
+            parallel::execution::detail::post_policy_dispatch<
+                    hpx::launch::async_policy
+                >::call(desc, hpx::launch::async, async_impl_ptr,
+                    std::move(this_), std::move(f));
 
             if (&ec != &throws)
                 ec = make_success_code();
@@ -549,7 +552,7 @@ namespace hpx { namespace lcos { namespace detail
             // the continuation
             boost::intrusive_ptr<continuation> this_(this);
             void (continuation::*cb)(shared_state_ptr &&, executor_type&) =
-                &continuation::async_exec<executor_type&>;
+                &continuation::async_exec;
 
             shared_state_ptr state = traits::detail::get_shared_state(future);
             typename shared_state_ptr::element_type* ptr = state.get();
@@ -581,7 +584,7 @@ namespace hpx { namespace lcos { namespace detail
             // the continuation
             boost::intrusive_ptr<continuation> this_(this);
             void (continuation::*cb)(shared_state_ptr &&, executor_type&&) =
-                &continuation::async_exec<executor_type&&>;
+                &continuation::async_exec;
 
             shared_state_ptr state = traits::detail::get_shared_state(future);
             typename shared_state_ptr::element_type* ptr = state.get();

diff --git a/hpx/lcos/when_all.hpp b/hpx/lcos/when_all.hpp
@@ -137,6 +137,7 @@ namespace hpx
 
 #include <hpx/config.hpp>
 #include <hpx/lcos/detail/future_data.hpp>
+#include <hpx/lcos/detail/future_traits.hpp>
 #include <hpx/lcos/detail/future_transforms.hpp>
 #include <hpx/lcos/future.hpp>
 #include <hpx/traits/acquire_future.hpp>