diff --git a/sycl/include/sycl/detail/group_sort_impl.hpp b/sycl/include/sycl/detail/group_sort_impl.hpp index 5b9d735d60445..2cbf6d01c59da 100644 --- a/sycl/include/sycl/detail/group_sort_impl.hpp +++ b/sycl/include/sycl/detail/group_sort_impl.hpp @@ -413,7 +413,7 @@ uint32_t getBucketValue(ValT value, uint32_t radix_iter) { } template ValT getDefaultValue(bool is_comp_asc) { if (is_comp_asc) - return std::numeric_limits::max(); + return (std::numeric_limits::max)(); else return std::numeric_limits::lowest(); } diff --git a/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp index 7a7d5283bd8ec..c42ba23b8469a 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp @@ -121,7 +121,7 @@ class radix_sorter { radix_sorter(sycl::span scratch_, const std::bitset mask = std::bitset( - std::numeric_limits::max())) + (std::numeric_limits::max)())) : scratch(scratch_.data()), scratch_size(scratch_.size()) { static_assert((std::is_arithmetic::value || std::is_same::value || @@ -187,8 +187,8 @@ class radix_sorter { sycl::range local_range) { // Scope is not important so far (void)scope; - return std::max(local_range.size() * sizeof(ValT), - local_range.size() * (1 << bits) * sizeof(uint32_t)); + return (std::max)(local_range.size() * sizeof(ValT), + local_range.size() * (1 << bits) * sizeof(uint32_t)); } };