Merge branch 'feature/issue260' into develop

nlohmann · Jun 14, 2016 · 39213bf · 39213bf
2 parents c744d59 + 44b210a
commit 39213bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/json.hpp b/src/json.hpp
@@ -8498,13 +8498,13 @@ class basic_json
             if (*curptr == '-')
             {
                 type = value_t::number_integer;
-                max = static_cast<uint64_t>(std::numeric_limits<number_integer_t>::max()) + 1;
+                max = static_cast<uint64_t>((std::numeric_limits<number_integer_t>::max)()) + 1;
                 curptr++;
             }
             else
             {
                 type = value_t::number_unsigned;
-                max = static_cast<uint64_t>(std::numeric_limits<number_unsigned_t>::max());
+                max = static_cast<uint64_t>((std::numeric_limits<number_unsigned_t>::max()));
             }
 
             // count the significant figures

diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
@@ -7808,13 +7808,13 @@ class basic_json
             if (*curptr == '-')
             {
                 type = value_t::number_integer;
-                max = static_cast<uint64_t>(std::numeric_limits<number_integer_t>::max()) + 1;
+                max = static_cast<uint64_t>((std::numeric_limits<number_integer_t>::max)()) + 1;
                 curptr++;
             }
             else
             {
                 type = value_t::number_unsigned;
-                max = static_cast<uint64_t>(std::numeric_limits<number_unsigned_t>::max());
+                max = static_cast<uint64_t>((std::numeric_limits<number_unsigned_t>::max()));
             }
 
             // count the significant figures