Merge branch 'feature/issue260' into develop

39213bf3 · Niels · c744d59f · 44b210aa · 39213bf3 · 39213bf3
Commit 39213bf3 authored Jun 14, 2016 by Niels
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

src/json.hpp src/json.hpp +2 -2

src/json.hpp.re2c src/json.hpp.re2c +2 -2

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -8498,13 +8498,13 @@ basic_json_parser_63:
            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

--- 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