Skip to content

Commit dfd4f27

Browse files
baderbader
authored
[SYC][NFC] Unify C++ version check (intel#5428)
Currently DPC++ headers use two different ways to check whether C++ version is 17 or higher. `#if __cplusplus > 201402L` and `#if __cplusplus >= 201703L`. This patch make `#if __cplusplus >= 201703L` a canonical version of the C++ version check.
1 parent ba1702e commit dfd4f27

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎sycl/include/CL/sycl/access/access.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ template <access_mode mode, target trgt> struct mode_target_tag_t {
7272
explicit mode_target_tag_t() = default;
7373
};
7474

75-
#if __cplusplus > 201402L
75+
#if __cplusplus >= 201703L
7676

7777
inline constexpr mode_tag_t<access_mode::read> read_only{};
7878
inline constexpr mode_tag_t<access_mode::read_write> read_write{};

‎sycl/include/CL/sycl/accessor.hpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ class __SYCL_SPECIAL_CLASS accessor :
876876
return AdjustedMode;
877877
}
878878

879-
#if __cplusplus > 201402L
879+
#if __cplusplus >= 201703L
880880

881881
template <typename TagT> static constexpr bool IsValidTag() {
882882
return std::is_same<TagT, mode_tag_t<AccessMode>>::value ||
@@ -1187,7 +1187,7 @@ class __SYCL_SPECIAL_CLASS accessor :
11871187
}
11881188
#endif
11891189

1190-
#if __cplusplus > 201402L
1190+
#if __cplusplus >= 201703L
11911191

11921192
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
11931193
typename TagT,
@@ -1277,7 +1277,7 @@ class __SYCL_SPECIAL_CLASS accessor :
12771277
}
12781278
#endif
12791279

1280-
#if __cplusplus > 201402L
1280+
#if __cplusplus >= 201703L
12811281

12821282
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
12831283
typename TagT,
@@ -1333,7 +1333,7 @@ class __SYCL_SPECIAL_CLASS accessor :
13331333
const detail::code_location CodeLoc = detail::code_location::current())
13341334
: accessor(BufferRef, AccessRange, {}, PropertyList, CodeLoc) {}
13351335

1336-
#if __cplusplus > 201402L
1336+
#if __cplusplus >= 201703L
13371337

13381338
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
13391339
typename TagT,
@@ -1389,7 +1389,7 @@ class __SYCL_SPECIAL_CLASS accessor :
13891389
: accessor(BufferRef, CommandGroupHandler, AccessRange, {}, PropertyList,
13901390
CodeLoc) {}
13911391

1392-
#if __cplusplus > 201402L
1392+
#if __cplusplus >= 201703L
13931393

13941394
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
13951395
typename TagT,
@@ -1486,7 +1486,7 @@ class __SYCL_SPECIAL_CLASS accessor :
14861486
}
14871487
#endif
14881488

1489-
#if __cplusplus > 201402L
1489+
#if __cplusplus >= 201703L
14901490

14911491
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
14921492
typename TagT,
@@ -1579,7 +1579,7 @@ class __SYCL_SPECIAL_CLASS accessor :
15791579
}
15801580
#endif
15811581

1582-
#if __cplusplus > 201402L
1582+
#if __cplusplus >= 201703L
15831583

15841584
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
15851585
typename TagT,
@@ -1770,7 +1770,7 @@ class __SYCL_SPECIAL_CLASS accessor :
17701770
}
17711771
};
17721772

1773-
#if __cplusplus > 201402L
1773+
#if __cplusplus >= 201703L
17741774

17751775
template <typename DataT, int Dimensions, typename AllocatorT>
17761776
accessor(buffer<DataT, Dimensions, AllocatorT>)
@@ -2302,7 +2302,7 @@ class host_accessor
23022302
return std::is_same<T, DataT>::value && (Dims > 0) && (Dims == Dimensions);
23032303
}
23042304

2305-
#if __cplusplus > 201402L
2305+
#if __cplusplus >= 201703L
23062306

23072307
template <typename TagT> static constexpr bool IsValidTag() {
23082308
return std::is_same<TagT, mode_tag_t<AccessMode>>::value;
@@ -2361,7 +2361,7 @@ class host_accessor
23612361
const detail::code_location CodeLoc = detail::code_location::current())
23622362
: AccessorT(BufferRef, PropertyList, CodeLoc) {}
23632363

2364-
#if __cplusplus > 201402L
2364+
#if __cplusplus >= 201703L
23652365

23662366
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
23672367
typename = detail::enable_if_t<IsSameAsBuffer<T, Dims>()>>
@@ -2381,7 +2381,7 @@ class host_accessor
23812381
const detail::code_location CodeLoc = detail::code_location::current())
23822382
: AccessorT(BufferRef, CommandGroupHandler, PropertyList, CodeLoc) {}
23832383

2384-
#if __cplusplus > 201402L
2384+
#if __cplusplus >= 201703L
23852385

23862386
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
23872387
typename = detail::enable_if_t<IsSameAsBuffer<T, Dims>()>>
@@ -2402,7 +2402,7 @@ class host_accessor
24022402
const detail::code_location CodeLoc = detail::code_location::current())
24032403
: AccessorT(BufferRef, AccessRange, {}, PropertyList, CodeLoc) {}
24042404

2405-
#if __cplusplus > 201402L
2405+
#if __cplusplus >= 201703L
24062406

24072407
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
24082408
typename = detail::enable_if_t<IsSameAsBuffer<T, Dims>()>>
@@ -2425,7 +2425,7 @@ class host_accessor
24252425
: AccessorT(BufferRef, CommandGroupHandler, AccessRange, {}, PropertyList,
24262426
CodeLoc) {}
24272427

2428-
#if __cplusplus > 201402L
2428+
#if __cplusplus >= 201703L
24292429

24302430
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
24312431
typename = detail::enable_if_t<IsSameAsBuffer<T, Dims>()>>
@@ -2449,7 +2449,7 @@ class host_accessor
24492449
: AccessorT(BufferRef, AccessRange, AccessOffset, PropertyList, CodeLoc) {
24502450
}
24512451

2452-
#if __cplusplus > 201402L
2452+
#if __cplusplus >= 201703L
24532453

24542454
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
24552455
typename = detail::enable_if_t<IsSameAsBuffer<T, Dims>()>>
@@ -2473,7 +2473,7 @@ class host_accessor
24732473
: AccessorT(BufferRef, CommandGroupHandler, AccessRange, AccessOffset,
24742474
PropertyList, CodeLoc) {}
24752475

2476-
#if __cplusplus > 201402L
2476+
#if __cplusplus >= 201703L
24772477

24782478
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
24792479
typename = detail::enable_if_t<IsSameAsBuffer<T, Dims>()>>
@@ -2489,7 +2489,7 @@ class host_accessor
24892489
#endif
24902490
};
24912491

2492-
#if __cplusplus > 201402L
2492+
#if __cplusplus >= 201703L
24932493

24942494
template <typename DataT, int Dimensions, typename AllocatorT>
24952495
host_accessor(buffer<DataT, Dimensions, AllocatorT>)

‎sycl/include/CL/sycl/buffer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ class buffer {
419419
*this, accessRange, accessOffset, {}, CodeLoc);
420420
}
421421

422-
#if __cplusplus > 201402L
422+
#if __cplusplus >= 201703L
423423

424424
template <typename... Ts> auto get_access(Ts... args) {
425425
return accessor{*this, args...};

‎sycl/include/CL/sycl/detail/accessor_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ using Requirement = AccessorImplHost;
209209

210210
void __SYCL_EXPORT addHostAccessorAndWait(Requirement *Req);
211211

212-
#if __cplusplus > 201402L
212+
#if __cplusplus >= 201703L
213213

214214
template <typename MayBeTag1, typename MayBeTag2>
215215
constexpr access::mode deduceAccessMode() {

‎sycl/include/CL/sycl/detail/defines_elementary.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
#endif
7676

7777
#ifndef __SYCL_FALLTHROUGH
78-
#if defined(__cplusplus) && __cplusplus > 201402L && \
78+
#if defined(__cplusplus) && __cplusplus >= 201703L && \
7979
__SYCL_HAS_CPP_ATTRIBUTE(fallthrough)
8080
#define __SYCL_FALLTHROUGH [[fallthrough]]
8181
#elif __SYCL_HAS_CPP_ATTRIBUTE(gnu::fallthrough)

‎sycl/include/CL/sycl/handler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ class __SYCL_EXPORT handler {
12981298
handler &operator=(const handler &) = delete;
12991299
handler &operator=(handler &&) = delete;
13001300

1301-
#if __cplusplus > 201402L
1301+
#if __cplusplus >= 201703L
13021302
template <auto &SpecName>
13031303
void set_specialization_constant(
13041304
typename std::remove_reference_t<decltype(SpecName)>::value_type Value) {

‎sycl/include/CL/sycl/kernel_bundle.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ class kernel_bundle : public detail::kernel_bundle_plain {
259259
// This guard is needed because the libsycl.so can compiled with C++ <=14
260260
// while the code requires C++17. This code is not supposed to be used by the
261261
// libsycl.so so it should not be a problem.
262-
#if __cplusplus > 201402L
262+
#if __cplusplus >= 201703L
263263
/// \returns true if any device image in the kernel_bundle uses specialization
264264
/// constant whose address is SpecName
265265
template <auto &SpecName> bool has_specialization_constant() const noexcept {

‎sycl/include/CL/sycl/kernel_handler.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace sycl {
2121
/// \ingroup sycl_api
2222
class kernel_handler {
2323
public:
24-
#if __cplusplus > 201402L
24+
#if __cplusplus >= 201703L
2525
template <auto &S>
2626
typename std::remove_reference_t<decltype(S)>::value_type
2727
get_specialization_constant() {
@@ -35,7 +35,7 @@ class kernel_handler {
3535
PI_INVALID_OPERATION);
3636
#endif // __SYCL_DEVICE_ONLY__
3737
}
38-
#endif // __cplusplus > 201402L
38+
#endif // __cplusplus >= 201703L
3939

4040
private:
4141
void __init_specialization_constants_buffer(

‎sycl/include/CL/sycl/properties/accessor_properties.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class __SYCL2020_DEPRECATED("spelling is now: no_init") noinit
2525

2626
} // namespace property
2727

28-
#if __cplusplus > 201402L
28+
#if __cplusplus >= 201703L
2929

3030
__SYCL_INLINE_CONSTEXPR property::no_init no_init;
3131

@@ -61,7 +61,7 @@ struct buffer_location {
6161
};
6262
};
6363
} // namespace property
64-
#if __cplusplus > 201402L
64+
#if __cplusplus >= 201703L
6565
template <int A>
6666
inline constexpr property::buffer_location::instance<A> buffer_location{};
6767
#endif
@@ -93,7 +93,7 @@ struct no_alias {
9393
};
9494
} // namespace property
9595

96-
#if __cplusplus > 201402L
96+
#if __cplusplus >= 201703L
9797

9898
inline constexpr property::no_offset::instance no_offset;
9999
inline constexpr property::no_alias::instance no_alias;

‎sycl/include/sycl/ext/oneapi/atomic_accessor.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace sycl {
1818
namespace ext {
1919
namespace oneapi {
2020

21-
#if __cplusplus > 201402L
21+
#if __cplusplus >= 201703L
2222

2323
template <memory_order> struct order_tag_t {
2424
explicit order_tag_t() = default;
@@ -69,7 +69,7 @@ class atomic_accessor
6969

7070
using AccessorT::AccessorT;
7171

72-
#if __cplusplus > 201402L
72+
#if __cplusplus >= 201703L
7373

7474
template <typename T = DataT, int Dims = Dimensions, typename AllocatorT,
7575
memory_order Order, memory_scope Scope>
@@ -108,7 +108,7 @@ class atomic_accessor
108108
}
109109
};
110110

111-
#if __cplusplus > 201402L
111+
#if __cplusplus >= 201703L
112112

113113
template <typename DataT, int Dimensions, typename AllocatorT,
114114
memory_order Order, memory_scope Scope>

0 commit comments

Comments
 (0)