Skip to content

Commit

Permalink
Fixed #1172: HPX build error with Clang 3.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
hkaiser committed Jul 1, 2014
1 parent 218de36 commit fb66c1b
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions hpx/runtime/components/server/runtime_support.hpp
Expand Up @@ -175,9 +175,13 @@ namespace hpx { namespace components { namespace server
BOOST_ATTRIBUTE_NORETURN void terminate(
naming::id_type const& respond_to);

void terminate_act(naming::id_type const& id) { terminate(id); }

/// \brief Shutdown runtime system instances on all localities
BOOST_ATTRIBUTE_NORETURN void terminate_all();

void terminate_all_act() { terminate_all(); }

/// \brief Retrieve configuration information
util::section get_config();

Expand Down Expand Up @@ -228,8 +232,10 @@ namespace hpx { namespace components { namespace server
free_component_action);
HPX_DEFINE_COMPONENT_ACTION(runtime_support, shutdown);
HPX_DEFINE_COMPONENT_ACTION(runtime_support, shutdown_all);
HPX_DEFINE_COMPONENT_ACTION(runtime_support, terminate);
HPX_DEFINE_COMPONENT_ACTION(runtime_support, terminate_all);
HPX_DEFINE_COMPONENT_ACTION(runtime_support, terminate_act,
terminate_action);
HPX_DEFINE_COMPONENT_ACTION(runtime_support, terminate_all_act,
terminate_all_action);

// even if this is not a short/minimal action, we still execute it
// directly to avoid a deadlock condition inside the thread manager
Expand Down

0 comments on commit fb66c1b

Please sign in to comment.