fixes

K-ballo · Oct 19, 2017 · 7905995 · 7905995
1 parent 5764067
commit 7905995
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/hpx/runtime/threads/detail/scheduling_loop.hpp b/hpx/runtime/threads/detail/scheduling_loop.hpp
@@ -256,21 +256,11 @@ namespace hpx { namespace threads { namespace detail
 
         explicit scheduling_callbacks(
                 callback_type && outer,
-                callback_type && inner = callback_type(),
-                background_callback_type && background =
-                    background_callback_type(),
-                std::size_t max_background_threads =
-                    hpx::util::safe_lexical_cast<std::size_t>(
-                        hpx::get_config_entry("hpx.max_background_threads",
-                            (std::numeric_limits<std::size_t>::max)())),
-                std::size_t max_idle_loop_count =
-                    hpx::util::safe_lexical_cast<std::int64_t>(
-                        hpx::get_config_entry("hpx.max_idle_loop_count",
-                            HPX_IDLE_LOOP_COUNT_MAX)),
-                std::size_t max_busy_loop_count =
-                    hpx::util::safe_lexical_cast<std::int64_t>(
-                        hpx::get_config_entry("hpx.max_busy_loop_count",
-                            HPX_BUSY_LOOP_COUNT_MAX)))
+                callback_type && inner,
+                background_callback_type && background,
+                std::size_t max_background_threads,
+                std::size_t max_idle_loop_count,
+                std::size_t max_busy_loop_count)
           : outer_(std::move(outer)),
             inner_(std::move(inner)),
             background_(std::move(background)),
@@ -279,6 +269,26 @@ namespace hpx { namespace threads { namespace detail
             max_busy_loop_count_(max_busy_loop_count)
         {}
 
+        explicit scheduling_callbacks(
+                callback_type && outer,
+                callback_type && inner = callback_type(),
+                background_callback_type && background =
+                    background_callback_type())
+          : scheduling_callbacks(
+                std::move(outer),
+                std::move(inner),
+                std::move(background),
+                hpx::util::safe_lexical_cast<std::size_t>(
+                    hpx::get_config_entry("hpx.max_background_threads",
+                        (std::numeric_limits<std::size_t>::max)())),
+                hpx::util::safe_lexical_cast<std::int64_t>(
+                    hpx::get_config_entry("hpx.max_idle_loop_count",
+                        HPX_IDLE_LOOP_COUNT_MAX)),
+                hpx::util::safe_lexical_cast<std::int64_t>(
+                    hpx::get_config_entry("hpx.max_busy_loop_count",
+                        HPX_BUSY_LOOP_COUNT_MAX)))
+        {}
+
         callback_type outer_;
         callback_type inner_;
         background_callback_type background_;

diff --git a/hpx/runtime/threads/executors/guided_pool_executor.hpp b/hpx/runtime/threads/executors/guided_pool_executor.hpp
@@ -148,7 +148,6 @@ namespace hpx { namespace threads { namespace executors
     // --------------------------------------------------------------------
     // this is a guided pool executor templated over a function type
     // the function type should be the one used for async calls
-    template <>
     template <typename R, typename...Args>
     struct HPX_EXPORT guided_pool_executor<pool_numa_hint<R(*)(Args...)>>
         : guided_pool_executor_base
@@ -183,7 +182,6 @@ namespace hpx { namespace threads { namespace executors
     // the args should be the same as those that would be called
     // for an async function or continuation. This makes it possible to
     // guide a lambda rather than a full function.
-    template <>
     template <typename...Args>
     struct HPX_EXPORT guided_pool_executor<pool_numa_hint<Args...>>
         : guided_pool_executor_base