Revert "Merge pull request #1701 from STEllAR-GROUP/distribution_poli…

…cy_executors" This reverts commit 9806a56, reversing changes made to aaa8eb5. This revert is necessary as the changes break the builds for gcc 4.6
STEllAR-GROUP · Aug 10, 2015 · 44ed9df · 44ed9df
1 parent 702e51e
commit 44ed9df
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 375 deletions.
diff --git a/docs/manual/parallel_algorithms.qbk b/docs/manual/parallel_algorithms.qbk
@@ -428,14 +428,7 @@ In __hpx__ we have implemented the following executor types:
   creates groups of parallel execution agents which execute in one of the
   kernel threads associated with a given pool category (I/O, parcel, or timer
   pool, or on the main thread of the application).
-* [classref hpx::parallel::v3::local_priority_queue_executor `hpx::parallel::local_priority_queue_executor`],
-  [classref hpx::parallel::v3::local_queue_executor `hpx::parallel::local_queue_executor`]
-  [classref hpx::parallel::v3::static_priority_queue_executor `hpx::parallel::static_priority_queue_executor`]
-  create executors on top of the corresponding __hpx__ schedulers.
-* [classref hpx::parallel::v3::distribution_policy_executor `hpx::parallel::distribution_policy_executor`]
-  creates executors using any of the existing distribution policies (like
-  [classref hpx::components::colocating_distribution_policy `hpx::components::colocating_distribution_policy]
-  et.al.).
+* [classref hpx::parallel::v3::local_priority_queue_executor `hpx::parallel::local_priority_queue_executor`]
 
 [endsect]
 

diff --git a/hpx/include/components.hpp b/hpx/include/components.hpp
@@ -26,8 +26,6 @@
 #include <hpx/runtime/components/server/create_component.hpp>
 #include <hpx/runtime/components/server/destroy_component.hpp>
 
-#include <hpx/runtime/components/server/invoke_function.hpp>
-
 #include <hpx/runtime/components/stubs/runtime_support.hpp>
 #include <hpx/runtime/components/client_base.hpp>
 

diff --git a/hpx/parallel/executors.hpp b/hpx/parallel/executors.hpp
@@ -12,7 +12,6 @@
 #include <hpx/parallel/executors/parallel_fork_executor.hpp>
 #include <hpx/parallel/executors/sequential_executor.hpp>
 #include <hpx/parallel/executors/service_executors.hpp>
-#include <hpx/parallel/executors/distribution_policy_executor.hpp>
 #include <hpx/parallel/executors/thread_pool_executors.hpp>
 #include <hpx/parallel/executors/this_thread_executors.hpp>
 

diff --git a/hpx/parallel/executors/distribution_policy_executor.hpp b/hpx/parallel/executors/distribution_policy_executor.hpp