Commit eba8244e authored by Isaac Nickaein's avatar Isaac Nickaein

Avoid collision of ::max with windows.h macro

parent 798e83a0
...@@ -73,8 +73,8 @@ TEST_CASE("concepts") ...@@ -73,8 +73,8 @@ TEST_CASE("concepts")
// X::size_type must return an unsigned integer // X::size_type must return an unsigned integer
CHECK((std::is_unsigned<json::size_type>::value)); CHECK((std::is_unsigned<json::size_type>::value));
// X::size_type can represent any non-negative value of X::difference_type // X::size_type can represent any non-negative value of X::difference_type
CHECK(static_cast<json::size_type>(std::numeric_limits<json::difference_type>::max()) <= CHECK(static_cast<json::size_type>((std::numeric_limits<json::difference_type>::max)()) <=
std::numeric_limits<json::size_type>::max()); (std::numeric_limits<json::size_type>::max)());
// the expression "X u" has the post-condition "u.empty()" // the expression "X u" has the post-condition "u.empty()"
{ {
......
...@@ -719,7 +719,7 @@ TEST_CASE("regression tests") ...@@ -719,7 +719,7 @@ TEST_CASE("regression tests")
}; };
check_roundtrip(100000000000.1236); check_roundtrip(100000000000.1236);
check_roundtrip(std::numeric_limits<json::number_float_t>::max()); check_roundtrip((std::numeric_limits<json::number_float_t>::max)());
// Some more numbers which fail to roundtrip when serialized with digits10 significand digits (instead of max_digits10) // Some more numbers which fail to roundtrip when serialized with digits10 significand digits (instead of max_digits10)
check_roundtrip(1.541888611948064e-17); check_roundtrip(1.541888611948064e-17);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment