1
0
mirror of https://github.com/nlohmann/json synced 2024-12-28 19:31:10 +00:00

Merge branch 'develop' into feature/issue698

This commit is contained in:
Niels Lohmann 2017-10-03 17:23:05 +02:00
commit 54bd1b5124
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69

View File

@ -6659,17 +6659,16 @@ class serializer
const bool is_negative = std::is_same<NumberType, number_integer_t>::value and (x < 0);
std::size_t i = 0;
// spare 1 byte for '\0'
while (x != 0 and i < number_buffer.size() - 1)
while (x != 0)
{
// spare 1 byte for '\0'
assert(i < number_buffer.size() - 1);
const auto digit = std::labs(static_cast<long>(x % 10));
number_buffer[i++] = static_cast<char>('0' + digit);
x /= 10;
}
// make sure the number has been processed completely
assert(x == 0);
if (is_negative)
{
// make sure there is capacity for the '-'
@ -6698,20 +6697,6 @@ class serializer
return;
}
// special case for 0.0 and -0.0
if (x == 0)
{
if (std::signbit(x))
{
o->write_characters("-0.0", 4);
}
else
{
o->write_characters("0.0", 3);
}
return;
}
// get number of digits for a text -> float -> text round-trip
static constexpr auto d = std::numeric_limits<number_float_t>::digits10;