Skip to content

Commit baab750

Browse files
cmake: remove HPX_WITH_CXX20_SOURCE_LOCATION feature flag from std_headers
1 parent 193cd5c commit baab750

1 file changed

Lines changed: 69 additions & 71 deletions

File tree

cmake/templates/std_headers.hpp.in

Lines changed: 69 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -9,130 +9,128 @@
99

1010
#pragma once
1111

12-
#include <hpx/config/defines.hpp>
1312
#include <hpx/config/compiler_specific.hpp>
13+
#include <hpx/config/defines.hpp>
1414
#include <hpx/config/modules_enabled.hpp>
1515

16-
@cxx_standard_headers@
16+
@cxx_standard_headers @
1717
#if defined(HPX_HAVE_STDEXEC)
18-
# if defined(HPX_GCC_VERSION)
19-
# pragma GCC diagnostic push
20-
# pragma GCC diagnostic ignored "-Wall"
21-
# pragma GCC diagnostic ignored "-Wextra"
22-
# pragma GCC diagnostic ignored "-Wmissing-braces"
23-
# elif defined(HPX_CLANG_VERSION)
24-
# pragma clang diagnostic push
25-
# pragma clang diagnostic ignored "-Weverything"
26-
# endif
18+
#if defined(HPX_GCC_VERSION)
19+
#pragma GCC diagnostic push
20+
#pragma GCC diagnostic ignored "-Wall"
21+
#pragma GCC diagnostic ignored "-Wextra"
22+
#pragma GCC diagnostic ignored "-Wmissing-braces"
23+
#elif defined(HPX_CLANG_VERSION)
24+
#pragma clang diagnostic push
25+
#pragma clang diagnostic ignored "-Weverything"
26+
#endif
2727

28-
# include <stdexec/execution.hpp>
28+
#include <stdexec/execution.hpp>
2929

30-
# if defined(HPX_GCC_VERSION)
31-
# pragma GCC diagnostic pop
32-
# elif defined(HPX_CLANG_VERSION)
33-
# pragma clang diagnostic pop
34-
# endif
30+
#if defined(HPX_GCC_VERSION)
31+
#pragma GCC diagnostic pop
32+
#elif defined(HPX_CLANG_VERSION)
33+
#pragma clang diagnostic pop
34+
#endif
3535
#endif
3636

3737
#if defined(HPX_HAVE_CXX20_COROUTINES)
38-
# if defined(__has_include)
39-
# if __has_include(<coroutine>)
40-
# include <coroutine>
41-
# elif __has_include(<experimental/coroutine>)
42-
# include <experimental/coroutine>
43-
# endif
44-
# endif
38+
#if defined(__has_include)
39+
#if __has_include(<coroutine>)
40+
#include <coroutine>
41+
#elif __has_include(<experimental/coroutine>)
42+
#include <experimental/coroutine>
43+
#endif
4544
#endif
46-
47-
#if defined(HPX_HAVE_CXX20_STD_BIT_CAST) || defined(HPX_HAVE_CXX20_STD_ENDIAN)
48-
# include <bit>
4945
#endif
46+
47+
#include <bit>
5048
#include <source_location>
5149

5250
#if defined(HPX_HAVE_CXX23_STD_GENERATOR)
53-
# include <generator>
51+
#include <generator>
5452
#endif
5553

5654
#if defined(HPX_GCC_VERSION)
57-
# include <cxxabi.h>
55+
#include <cxxabi.h>
5856
#endif
5957

6058
#if defined(HPX_WINDOWS)
61-
# include <excpt.h>
62-
# undef exception_info
59+
#include <excpt.h>
60+
#undef exception_info
6361
#endif
6462

6563
#include <asio.hpp>
6664
#include <hwloc.h>
6765

6866
#if defined(HPX_HAVE_MODULE_LIKWID)
69-
# include <likwid.h>
67+
#include <likwid.h>
7068
#endif
7169

7270
// Include MPI headers if required
7371
#if (defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCELPORT_MPI)) || \
7472
defined(HPX_HAVE_MODULE_MPI_BASE)
7573

76-
# if defined(HPX_CLANG_VERSION)
77-
# pragma clang diagnostic push
78-
# pragma clang diagnostic ignored "-Wcast-qual"
79-
# elif defined(HPX_GCC_VERSION)
80-
# pragma GCC diagnostic push
81-
# pragma GCC diagnostic ignored "-Wcast-qual"
82-
# endif
74+
#if defined(HPX_CLANG_VERSION)
75+
#pragma clang diagnostic push
76+
#pragma clang diagnostic ignored "-Wcast-qual"
77+
#elif defined(HPX_GCC_VERSION)
78+
#pragma GCC diagnostic push
79+
#pragma GCC diagnostic ignored "-Wcast-qual"
80+
#endif
8381

84-
# include <mpi.h>
82+
#include <mpi.h>
8583

86-
# if defined(HPX_GCC_VERSION)
87-
# pragma GCC diagnostic pop
88-
# elif defined(HPX_CLANG_VERSION)
89-
# pragma clang diagnostic pop
90-
# endif
84+
#if defined(HPX_GCC_VERSION)
85+
#pragma GCC diagnostic pop
86+
#elif defined(HPX_CLANG_VERSION)
87+
#pragma clang diagnostic pop
88+
#endif
9189

9290
#endif
9391

9492
// Include LCI headers if required
9593
#if (defined(HPX_HAVE_NETWORKING) && defined(HPX_HAVE_PARCELPORT_LCI)) || \
9694
defined(HPX_HAVE_MODULE_LCI_BASE)
97-
# include "lci.hpp"
98-
# include "lct.h"
95+
#include "lci.hpp"
96+
#include "lct.h"
9997
#endif
10098

10199
#if defined(HPX_HAVE_MODULE_ASYNC_CUDA)
102-
# if defined(HPX_HAVE_CUDA) && defined(HPX_HAVE_GPUBLAS)
103-
# include <cublas_v2.h>
104-
# elif defined(HPX_HAVE_HIP) && defined(HPX_HAVE_GPUBLAS)
105-
# include <hipblas.h>
106-
# endif
100+
#if defined(HPX_HAVE_CUDA) && defined(HPX_HAVE_GPUBLAS)
101+
#include <cublas_v2.h>
102+
#elif defined(HPX_HAVE_HIP) && defined(HPX_HAVE_GPUBLAS)
103+
#include <hipblas.h>
104+
#endif
107105
#endif
108106

109107
#if defined(HPX_HAVE_MODULE_THRUST)
110-
# include <hpx/thrust/thrust_headers.hpp>
108+
#include <hpx/thrust/thrust_headers.hpp>
111109
#endif
112110

113111
#if defined(HPX_HAVE_MM_PREFETCH)
114-
# if defined(HPX_MSVC)
115-
# include <intrin.h>
116-
# endif
117-
# if defined(HPX_GCC_VERSION)
118-
# include <emmintrin.h>
119-
# endif
112+
#if defined(HPX_MSVC)
113+
#include <intrin.h>
114+
#endif
115+
#if defined(HPX_GCC_VERSION)
116+
#include <emmintrin.h>
117+
#endif
120118
#endif
121119

122120
#if defined(HPX_HAVE_DATAPAR)
123-
# if defined(HPX_HAVE_DATAPAR_EVE)
124-
# include <eve/eve.hpp>
125-
# include <eve/memory/aligned_ptr.hpp>
126-
# endif
127-
# if defined(HPX_HAVE_DATAPAR_STD_EXPERIMENTAL_SIMD)
128-
# include <experimental/simd>
129-
# endif
130-
# if defined(HPX_HAVE_DATAPAR_VC)
131-
# include <Vc/Vc>
132-
# include <Vc/global.h>
133-
# endif
121+
#if defined(HPX_HAVE_DATAPAR_EVE)
122+
#include <eve/eve.hpp>
123+
#include <eve/memory/aligned_ptr.hpp>
124+
#endif
125+
#if defined(HPX_HAVE_DATAPAR_STD_EXPERIMENTAL_SIMD)
126+
#include <experimental/simd>
127+
#endif
128+
#if defined(HPX_HAVE_DATAPAR_VC)
129+
#include <Vc/Vc>
130+
#include <Vc/global.h>
131+
#endif
134132
#endif
135133

136134
#if defined(HPX_HAVE_DISTRIBUTED_RUNTIME)
137-
# include <boost/accumulators/accumulators.hpp>
135+
#include <boost/accumulators/accumulators.hpp>
138136
#endif

0 commit comments

Comments
 (0)