amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-07-20 01:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/issue260' into develop

Browse Source
This commit is contained in:
Niels
2016-06-14 08:28:36 +02:00
parent c744d59f2d 44b210aa77
commit 39213bf34e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json.hpp
+2 -2
View File
@@ -8498,13 +8498,13 @@ basic_json_parser_63:
if (*curptr == '-') if (*curptr == '-')
{ {
type = value_t::number_integer; 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++; curptr++;
} }
else else
{ {
type = value_t::number_unsigned; 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 // count the significant figures
src/json.hpp.re2c
+2 -2
View File
@@ -7808,13 +7808,13 @@ class basic_json
if (*curptr == '-') if (*curptr == '-')
{ {
type = value_t::number_integer; 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++; curptr++;
} }
else else
{ {
type = value_t::number_unsigned; 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 // count the significant figures