From 5450029dcacc416bf01f76c2f5b9768e529b91ad Mon Sep 17 00:00:00 2001 From: KsaNL <73447685+KsaNL@users.noreply.github.com> Date: Sat, 30 Jul 2022 16:30:51 +0800 Subject: [PATCH] Fixed latest build error in msvc platform warnings in msvc about mix/max macro while windows.h is used in the project #762 --- include/nlohmann/detail/meta/type_traits.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index 796d5b0cd..2472f3c11 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -620,7 +620,7 @@ struct value_in_range_of_impl2 static constexpr bool test(T val) { using CommonType = typename std::common_type::type; - return static_cast(val) <= static_cast(std::numeric_limits::max()); + return static_cast(val) <= static_cast((std::numeric_limits::max)()); } }; @@ -630,7 +630,7 @@ struct value_in_range_of_impl2 static constexpr bool test(T val) { using CommonType = typename std::common_type::type; - return static_cast(val) <= static_cast(std::numeric_limits::max()); + return static_cast(val) <= static_cast((std::numeric_limits::max)()); } }; @@ -640,7 +640,7 @@ struct value_in_range_of_impl2 static constexpr bool test(T val) { using CommonType = typename std::common_type::type; - return val >= 0 && static_cast(val) <= static_cast(std::numeric_limits::max()); + return val >= 0 && static_cast(val) <= static_cast((std::numeric_limits::max)()); } }; @@ -651,8 +651,8 @@ struct value_in_range_of_impl2 static constexpr bool test(T val) { using CommonType = typename std::common_type::type; - return static_cast(val) >= static_cast(std::numeric_limits::min()) - && static_cast(val) <= static_cast(std::numeric_limits::max()); + return static_cast(val) >= static_cast((std::numeric_limits::min)()) + && static_cast(val) <= static_cast((std::numeric_limits::max)()); } };