Skip to content

Commit 38bacb8

Browse files
committed
Replace hpx::local:: with hpx::
1 parent 3b8caa8 commit 38bacb8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

include/cppuddle/kernel_aggregation/detail/aggregation_executors_and_allocators.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ template <typename Executor> class aggregated_function_call {
148148
std::atomic<size_t> slice_counter = 0;
149149
150150
/// Promise to be set when all slices have visited this function call
151-
/* hpx::local::promise<void> slices_ready_promise; */
151+
/* hpx::promise<void> slices_ready_promise; */
152152
/// Tracks if all slices have visited this function call
153153
/* hpx::future<void> all_slices_ready = slices_ready_promise.get_future(); */
154154
/// How many slices can we expect?
@@ -168,7 +168,7 @@ template <typename Executor> class aggregated_function_call {
168168
aggregation_mutex_t debug_mut;
169169
#endif
170170
171-
std::vector<hpx::local::promise<void>> potential_async_promises{};
171+
std::vector<hpx::promise<void>> potential_async_promises{};
172172
173173
public:
174174
aggregated_function_call(const size_t number_slices, bool async_mode, Executor &exec)
@@ -557,10 +557,10 @@ template <typename Executor> class aggregated_executor {
557557
558558
//===============================================================================
559559
560-
hpx::local::promise<void> slices_full_promise;
560+
hpx::promise<void> slices_full_promise;
561561
/// Promises with the slice executors -- to be set when the starting criteria
562562
/// is met
563-
std::vector<hpx::local::promise<executor_slice>> executor_slices;
563+
std::vector<hpx::promise<executor_slice>> executor_slices;
564564
/// List of aggregated function calls - function will be launched when all
565565
/// slices have called it
566566
std::deque<aggregated_function_call<Executor>> function_calls;
@@ -839,14 +839,14 @@ template <typename Executor> class aggregated_executor {
839839
dealloc_counter = 0;
840840
841841
if (mode == aggregated_executor_modes::STRICT ) {
842-
slices_full_promise = hpx::local::promise<void>{};
842+
slices_full_promise = hpx::promise<void>{};
843843
}
844844
}
845845
846846
// Create Executor Slice future -- that will be returned later
847847
hpx::future<executor_slice> ret_fut;
848848
if (local_slice_id < max_slices) {
849-
executor_slices.emplace_back(hpx::local::promise<executor_slice>{});
849+
executor_slices.emplace_back(hpx::promise<executor_slice>{});
850850
ret_fut =
851851
executor_slices[local_slice_id - 1].get_future();
852852
} else {

0 commit comments

Comments
 (0)