Merge branch 'feature/issue260' into develop

This commit is contained in:
Niels 2016-06-14 08:28:36 +02:00
commit 39213bf34e
2 changed files with 4 additions and 4 deletions

View file

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

View file

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