Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Adding missing #include and missing guard for optional code section
This fixes #2893
  • Loading branch information
hkaiser committed Sep 11, 2017
1 parent 8e9926a commit 1ddd79d
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions src/runtime/threads/threadmanager.cpp
Expand Up @@ -10,6 +10,7 @@
#include <hpx/config.hpp>
#include <hpx/compat/mutex.hpp>
#include <hpx/exception.hpp>
#include <hpx/error_code.hpp>
#include <hpx/performance_counters/counter_creators.hpp>
#include <hpx/performance_counters/counters.hpp>
#include <hpx/performance_counters/manage_counter_type.hpp>
Expand Down Expand Up @@ -419,8 +420,7 @@ namespace hpx { namespace threads

#else
throw detail::command_line_error(
"Command line option "
"--hpx:queuing=local "
"Command line option --hpx:queuing=local "
"is not configured in this build. Please rebuild with "
"'cmake -DHPX_WITH_THREAD_SCHEDULERS=local'.");
#endif
Expand Down Expand Up @@ -536,8 +536,7 @@ namespace hpx { namespace threads

#else
throw detail::command_line_error(
"Command line option "
"--hpx:queuing=static "
"Command line option --hpx:queuing=static "
"is not configured in this build. Please rebuild with "
"'cmake -DHPX_WITH_THREAD_SCHEDULERS=static'.");
#endif
Expand Down Expand Up @@ -583,8 +582,7 @@ namespace hpx { namespace threads

#else
throw detail::command_line_error(
"Command line option "
"--hpx:queuing=static-priority "
"Command line option --hpx:queuing=static-priority "
"is not configured in this build. Please rebuild with "
"'cmake -DHPX_WITH_THREAD_SCHEDULERS=static-priority'.");
#endif
Expand Down Expand Up @@ -625,8 +623,7 @@ namespace hpx { namespace threads
pools_.push_back(std::move(pool));
#else
throw detail::command_line_error(
"Command line option "
"--hpx:queuing=abp-priority "
"Command line option --hpx:queuing=abp-priority "
"is not configured in this build. Please rebuild with "
"'cmake -DHPX_WITH_THREAD_SCHEDULERS=abp-priority'.");
#endif
Expand Down Expand Up @@ -666,8 +663,7 @@ namespace hpx { namespace threads
pools_.push_back(std::move(pool));
#else
throw detail::command_line_error(
"Command line option "
"--hpx:queuing=hierarchy "
"Command line option --hpx:queuing=hierarchy "
"is not configured in this build. Please rebuild with "
"'cmake -DHPX_WITH_THREAD_SCHEDULERS=hierarchy'.");
#endif
Expand All @@ -676,6 +672,7 @@ namespace hpx { namespace threads

case resource::periodic_priority:
{
#if defined(HPX_HAVE_PERIODIC_PRIORITY_SCHEDULER)
// set parameters for scheduler and pool instantiation and
// perform compatibility checks
hpx::detail::ensure_hierarchy_arity_compatibility(cfg_.vm_);
Expand Down Expand Up @@ -705,7 +702,12 @@ namespace hpx { namespace threads
policies::delay_exit),
thread_offset));
pools_.push_back(std::move(pool));

#else
throw detail::command_line_error(
"Command line option --hpx:queuing=periodic-priority "
"is not configured in this build. Please rebuild with "
"'cmake -DHPX_WITH_THREAD_SCHEDULERS=periodic-priority'.");
#endif
break;
}

Expand Down Expand Up @@ -742,8 +744,7 @@ namespace hpx { namespace threads

#else
throw hpx::detail::command_line_error(
"Command line option "
"--hpx:queuing=throttle "
"Command line option --hpx:queuing=throttle "
"is not configured in this build. Please rebuild with "
"'cmake -DHPX_WITH_THREAD_SCHEDULERS=throttle "
"-DHPX_WITH_APEX'.");
Expand Down

0 comments on commit 1ddd79d

Please sign in to comment.