@@ -1194,8 +1194,7 @@ class __SYCL_EXPORT handler {
11941194 // Range rounding is supported only for newer SYCL standards.
11951195#if !defined(__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__) && \
11961196 !defined (DPCPP_HOST_DEVICE_OPENMP) && \
1197- !defined (DPCPP_HOST_DEVICE_PERF_NATIVE) && \
1198- SYCL_LANGUAGE_VERSION >= 202012L
1197+ !defined (DPCPP_HOST_DEVICE_PERF_NATIVE)
11991198 auto [RoundedRange, HasRoundedRange] = getRoundedRange (UserRange);
12001199 if (HasRoundedRange) {
12011200 using NameWT = typename detail::get_kernel_wrapper_name_t <NameT>::name;
@@ -1224,8 +1223,7 @@ class __SYCL_EXPORT handler {
12241223#endif
12251224 } else
12261225#endif // !__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ &&
1227- // !DPCPP_HOST_DEVICE_OPENMP && !DPCPP_HOST_DEVICE_PERF_NATIVE &&
1228- // SYCL_LANGUAGE_VERSION >= 202012L
1226+ // !DPCPP_HOST_DEVICE_OPENMP && !DPCPP_HOST_DEVICE_PERF_NATIVE
12291227 {
12301228 (void )UserRange;
12311229 (void )Props;
@@ -1838,11 +1836,8 @@ class __SYCL_EXPORT handler {
18381836
18391837 template <typename T> struct ShouldEnableSetArg {
18401838 static constexpr bool value =
1841- std::is_trivially_copyable_v<std::remove_reference_t <T>>
1842- #if SYCL_LANGUAGE_VERSION && SYCL_LANGUAGE_VERSION <= 201707
1843- && std::is_standard_layout<std::remove_reference_t <T>>::value
1844- #endif
1845- || is_same_type<sampler, T>::value // Sampler
1839+ std::is_trivially_copyable_v<std::remove_reference_t <T>> ||
1840+ is_same_type<sampler, T>::value // Sampler
18461841 || (!is_same_type<cl_mem, T>::value &&
18471842 std::is_pointer_v<remove_cv_ref_t <T>>) // USM
18481843 || is_same_type<cl_mem, T>::value; // Interop
0 commit comments