Skip to content

Commit

Permalink
Merge pull request #118 from aurianer/change_local_lcos_includes
Browse files Browse the repository at this point in the history
Change local_lcos includes (new hpx module)
  • Loading branch information
khuck authored Dec 3, 2019
2 parents 11ac00d + afb6e9a commit 13df1c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/apex/apex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include <hpx/include/performance_counters.hpp>
#include <hpx/include/actions.hpp>
#include <hpx/include/util.hpp>
#include <hpx/lcos/local/composable_guard.hpp>
#include <hpx/local_lcos/composable_guard.hpp>
#include "global_constructor_destructor.h"
#ifdef APEX_HAVE_HPX_disabled
static void apex_schedule_shutdown(void);
Expand Down
2 changes: 1 addition & 1 deletion src/apex/profiler_listener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ std::mutex event_set_mutex;
#include <hpx/include/performance_counters.hpp>
#include <hpx/include/actions.hpp>
#include <hpx/include/util.hpp>
#include <hpx/lcos/local/composable_guard.hpp>
#include <hpx/local_lcos/composable_guard.hpp>
static void apex_schedule_process_profiles(void); // not in apex namespace
const int num_non_worker_threads_registered = 1; // including the main thread
#endif
Expand Down

0 comments on commit 13df1c1

Please sign in to comment.