@@ -148,7 +148,7 @@ template <typename Executor> class aggregated_function_call {
148
148
std::atomic<size_t> slice_counter = 0;
149
149
150
150
/// 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; */
152
152
/// Tracks if all slices have visited this function call
153
153
/* hpx::future<void> all_slices_ready = slices_ready_promise.get_future(); */
154
154
/// How many slices can we expect?
@@ -168,7 +168,7 @@ template <typename Executor> class aggregated_function_call {
168
168
aggregation_mutex_t debug_mut;
169
169
#endif
170
170
171
- std::vector<hpx::local:: promise<void>> potential_async_promises{};
171
+ std::vector<hpx::promise<void>> potential_async_promises{};
172
172
173
173
public:
174
174
aggregated_function_call(const size_t number_slices, bool async_mode, Executor &exec)
@@ -557,10 +557,10 @@ template <typename Executor> class aggregated_executor {
557
557
558
558
//===============================================================================
559
559
560
- hpx::local:: promise<void> slices_full_promise;
560
+ hpx::promise<void> slices_full_promise;
561
561
/// Promises with the slice executors -- to be set when the starting criteria
562
562
/// is met
563
- std::vector<hpx::local:: promise<executor_slice>> executor_slices;
563
+ std::vector<hpx::promise<executor_slice>> executor_slices;
564
564
/// List of aggregated function calls - function will be launched when all
565
565
/// slices have called it
566
566
std::deque<aggregated_function_call<Executor>> function_calls;
@@ -839,14 +839,14 @@ template <typename Executor> class aggregated_executor {
839
839
dealloc_counter = 0;
840
840
841
841
if (mode == aggregated_executor_modes::STRICT ) {
842
- slices_full_promise = hpx::local:: promise<void>{};
842
+ slices_full_promise = hpx::promise<void>{};
843
843
}
844
844
}
845
845
846
846
// Create Executor Slice future -- that will be returned later
847
847
hpx::future<executor_slice> ret_fut;
848
848
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>{});
850
850
ret_fut =
851
851
executor_slices[local_slice_id - 1].get_future();
852
852
} else {
0 commit comments