Skip to content

Commit c47473e

Browse files
[NFC][Reduction] Remove C++17 guards (#7181)
We only support C++17 and above through the whole SYCL RT.
1 parent 60899e1 commit c47473e

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

sycl/include/sycl/handler.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,10 +1756,6 @@ class __SYCL_EXPORT handler {
17561756
KernelFunc);
17571757
}
17581758

1759-
// "if constexpr" simplifies implementation/increases readability in comparison
1760-
// with SFINAE-based approach.
1761-
#if __cplusplus >= 201703L
1762-
17631759
/// Defines and invokes a SYCL kernel function for the specified nd_range.
17641760
///
17651761
/// The SYCL kernel function is defined as a lambda function or a named
@@ -1982,7 +1978,6 @@ class __SYCL_EXPORT handler {
19821978
});
19831979
} // end while (NWorkItems > 1)
19841980
}
1985-
#endif // __cplusplus >= 201703L
19861981

19871982
/// Hierarchical kernel invocation method of a kernel defined as a lambda
19881983
/// encoding the body of each work-group to launch.

sycl/include/sycl/reduction.hpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@ template <typename T> struct AreAllButLastReductions<T> {
4949
static constexpr bool value = !IsReduction<T>::value;
5050
};
5151
} // namespace detail
52-
} // __SYCL_INLINE_VER_NAMESPACE(_V1)
53-
} // namespace sycl
54-
55-
#if __cplusplus >= 201703L
56-
// Entire feature is dependent on C++17. We still have to make the trait above
57-
// available as queue shortcuts use them unconditionally, including on
58-
// non-reduction path.
59-
namespace sycl {
60-
__SYCL_INLINE_VER_NAMESPACE(_V1) {
61-
6252

6353
/// Class that is used to represent objects that are passed to user's lambda
6454
/// functions and representing users' reduction variable.
@@ -2477,7 +2467,6 @@ auto reduction(T *Var, const T &Identity, BinaryOperation Combiner,
24772467
InitializeToIdentity);
24782468
}
24792469

2480-
#if __cplusplus >= 201703L
24812470
/// Constructs a reduction object using the reduction variable referenced by
24822471
/// the given sycl::span \p Span, reduction operation \p Combiner, and
24832472
/// optional reduction properties.
@@ -2524,9 +2513,5 @@ auto reduction(span<T, Extent> Span, const T &Identity,
25242513
return detail::make_reduction<BinaryOperation, 1, Extent>(
25252514
Span.data(), Identity, Combiner, InitializeToIdentity);
25262515
}
2527-
#endif
2528-
25292516
} // __SYCL_INLINE_VER_NAMESPACE(_V1)
25302517
} // namespace sycl
2531-
2532-
#endif // __cplusplus >= 201703L

0 commit comments

Comments
 (0)