Change macros to numeric_limits #1483

nlohmann · Mar 13, 2019 · 0067ea8 · 0067ea8
1 parent 0c65ba9
commit 0067ea8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/nlohmann/detail/conversions/to_chars.hpp b/include/nlohmann/detail/conversions/to_chars.hpp
@@ -751,7 +751,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
         //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
         //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
         //
-        assert(p2 <= UINT64_MAX / 10);
+        assert(p2 <= std::numeric_limits<std::uint64_t>::max() / 10);
         p2 *= 10;
         const uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
         const uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -10579,7 +10579,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
         //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
         //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
         //
-        assert(p2 <= UINT64_MAX / 10);
+        assert(p2 <= std::numeric_limits<std::uint64_t>::max() / 10);
         p2 *= 10;
         const uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
         const uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e