diff --git a/sycl/include/CL/sycl/ONEAPI/atomic_enums.hpp b/sycl/include/CL/sycl/ONEAPI/atomic_enums.hpp index a61b287790449..9a18e3b173250 100644 --- a/sycl/include/CL/sycl/ONEAPI/atomic_enums.hpp +++ b/sycl/include/CL/sycl/ONEAPI/atomic_enums.hpp @@ -60,9 +60,7 @@ __SYCL_INLINE_CONSTEXPR memory_scope memory_scope_system = memory_scope::system; #ifndef __SYCL_DEVICE_ONLY__ namespace detail { -// Cannot use switch statement in constexpr before C++14 -// Nested ternary conditions in else branch required for C++11 -#if __cplusplus >= 201402L + static inline constexpr std::memory_order getStdMemoryOrder(::cl::sycl::ONEAPI::memory_order order) { switch (order) { @@ -80,22 +78,7 @@ getStdMemoryOrder(::cl::sycl::ONEAPI::memory_order order) { return std::memory_order_seq_cst; } } -#else -static inline constexpr std::memory_order -getStdMemoryOrder(::cl::sycl::ONEAPI::memory_order order) { - return (order == memory_order::relaxed) - ? std::memory_order_relaxed - : (order == memory_order::__consume_unsupported) - ? std::memory_order_consume - : (order == memory_order::acquire) - ? std::memory_order_acquire - : (order == memory_order::release) - ? std::memory_order_release - : (order == memory_order::acq_rel) - ? std::memory_order_acq_rel - : std::memory_order_seq_cst; -} -#endif // __cplusplus + } // namespace detail #endif // __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp b/sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp index bf5150cd4e42d..b64331232f377 100644 --- a/sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp +++ b/sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp @@ -69,9 +69,6 @@ template <> struct memory_order_traits { static constexpr memory_order write_order = memory_order::seq_cst; }; -// Cannot use switch statement in constexpr before C++14 -// Nested ternary conditions in else branch required for C++11 -#if __cplusplus >= 201402L inline constexpr memory_order getLoadOrder(memory_order order) { switch (order) { case memory_order_relaxed: @@ -87,14 +84,6 @@ inline constexpr memory_order getLoadOrder(memory_order order) { return memory_order_seq_cst; } } -#else -inline constexpr memory_order getLoadOrder(memory_order order) { - return (order == memory_order_relaxed) - ? memory_order_relaxed - : (order == memory_order_seq_cst) ? memory_order_seq_cst - : memory_order_acquire; -} -#endif template struct bit_equal; diff --git a/sycl/include/CL/sycl/ONEAPI/functional.hpp b/sycl/include/CL/sycl/ONEAPI/functional.hpp index c149a51a6068f..ba4d49d7a414f 100644 --- a/sycl/include/CL/sycl/ONEAPI/functional.hpp +++ b/sycl/include/CL/sycl/ONEAPI/functional.hpp @@ -19,7 +19,6 @@ template struct minimum { } }; -#if __cplusplus >= 201402L template <> struct minimum { struct is_transparent {}; template @@ -30,7 +29,6 @@ template <> struct minimum { : std::forward(rhs); } }; -#endif template struct maximum { T operator()(const T &lhs, const T &rhs) const { @@ -38,7 +36,6 @@ template struct maximum { } }; -#if __cplusplus >= 201402L template <> struct maximum { struct is_transparent {}; template @@ -50,7 +47,6 @@ template <> struct maximum { : std::forward(rhs); } }; -#endif template using plus = std::plus; template using multiplies = std::multiplies; diff --git a/sycl/include/CL/sycl/half_type.hpp b/sycl/include/CL/sycl/half_type.hpp index 6627612f79cb2..9b6770a7caa35 100644 --- a/sycl/include/CL/sycl/half_type.hpp +++ b/sycl/include/CL/sycl/half_type.hpp @@ -26,11 +26,6 @@ #else #define __SYCL_CONSTEXPR_ON_DEVICE #endif -#if __cplusplus >= 201402L -#define _CPP14_CONSTEXPR constexpr -#else -#define _CPP14_CONSTEXPR -#endif __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -80,7 +75,7 @@ class __SYCL_EXPORT half { } // Operator neg - _CPP14_CONSTEXPR half &operator-() { + constexpr half &operator-() { Buf ^= 0x8000; return *this; } @@ -207,11 +202,11 @@ class half { operator--(); return ret; } - _CPP14_CONSTEXPR half &operator-() { + constexpr half &operator-() { Data = -Data; return *this; } - _CPP14_CONSTEXPR half operator-() const { + constexpr half operator-() const { half r = *this; return -r; }