Skip to content

Commit a2c0134

Browse files
committed
remove ifdef gaurds
1 parent 357377e commit a2c0134

2 files changed

Lines changed: 8 additions & 14 deletions

File tree

libs/core/executors/include/hpx/executors/explicit_scheduler_executor.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ namespace hpx::execution::experimental {
232232

233233
#if !defined(HPX_HAVE_STDEXEC)
234234
template <typename F, typename S, typename... Ts>
235-
requires(!std::is_integral_v<S>)
235+
HPX_CONCEPT_REQUIRES_(!std::is_integral_v<S>)
236236
friend decltype(auto) tag_invoke(
237237
hpx::parallel::execution::bulk_sync_execute_t,
238238
explicit_scheduler_executor const& exec, F&& f, S const& shape,
@@ -244,7 +244,6 @@ namespace hpx::execution::experimental {
244244
}
245245
#endif
246246

247-
#if !defined(HPX_HAVE_STDEXEC)
248247
template <typename F, typename S, typename Future, typename... Ts>
249248
requires(!std::is_integral_v<S>)
250249
friend auto tag_invoke(hpx::parallel::execution::bulk_then_execute_t,
@@ -265,7 +264,6 @@ namespace hpx::execution::experimental {
265264
bulk(shape,
266265
hpx::bind_back(HPX_FORWARD(F, f), HPX_FORWARD(Ts, ts)...));
267266
}
268-
#endif
269267

270268
private:
271269
std::decay_t<BaseScheduler> sched_;

libs/core/executors/include/hpx/executors/thread_pool_scheduler.hpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,19 @@
88
#pragma once
99

1010
#include <hpx/assert.hpp>
11-
#include <hpx/async_base/launch_policy.hpp>
12-
#include <hpx/concepts/concepts.hpp>
13-
#include <hpx/errors/try_catch_exception_ptr.hpp>
14-
#include <hpx/execution_base/completion_scheduler.hpp>
15-
#include <hpx/execution_base/completion_signatures.hpp>
16-
#include <hpx/execution_base/receiver.hpp>
17-
#include <hpx/execution_base/sender.hpp>
18-
#include <hpx/executors/current_executor.hpp>
19-
#include <hpx/executors/exception_list.hpp>
20-
#include <hpx/functional/detail/invoke.hpp>
21-
#include <hpx/functional/invoke_result.hpp>
11+
#include <hpx/modules/async_base.hpp>
12+
#include <hpx/modules/concepts.hpp>
2213
#include <hpx/modules/errors.hpp>
14+
#include <hpx/modules/execution.hpp>
15+
#include <hpx/modules/execution_base.hpp>
16+
#include <hpx/modules/threading_base.hpp>
17+
#include <hpx/modules/timing.hpp>
2318
#include <hpx/modules/topology.hpp>
2419

2520
#include <cstddef>
2621
#include <exception>
2722
#include <string>
23+
#include <type_traits>
2824
#include <utility>
2925

3026
#if defined(HPX_HAVE_STDEXEC)

0 commit comments

Comments
 (0)