j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add workaround for gcc < 5 not supporting std::defaultfloat

Browse source
This commit is contained in:
Trevor Welsby 2016-01-24 17:54:50 +10:00
parent bd8db5d40e
commit c1f5f0451d
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/json.hpp
View file

@ -5544,7 +5544,10 @@ class basic_json
// 15 digits of precision allows round-trip IEEE 754 string->double->string; // 15 digits of precision allows round-trip IEEE 754 string->double->string;
// to be safe, we read this value from std::numeric_limits<number_float_t>::digits10 // to be safe, we read this value from std::numeric_limits<number_float_t>::digits10
if (std::fmod(m_value.number_float, 1) == 0) o << std::fixed << std::setprecision(1); if (std::fmod(m_value.number_float, 1) == 0) o << std::fixed << std::setprecision(1);
else o << std::defaultfloat << std::setprecision(std::numeric_limits<double>::digits10); else {
o.unsetf(std::ios_base::floatfield); // std::defaultfloat not supported in gcc version < 5
o << std::setprecision(std::numeric_limits<double>::digits10);
}
o << m_value.number_float; o << m_value.number_float;
return; return;
} }

5
src/json.hpp.re2c
View file

@ -5544,7 +5544,10 @@ class basic_json
// 15 digits of precision allows round-trip IEEE 754 string->double->string; // 15 digits of precision allows round-trip IEEE 754 string->double->string;
// to be safe, we read this value from std::numeric_limits<number_float_t>::digits10 // to be safe, we read this value from std::numeric_limits<number_float_t>::digits10
if (std::fmod(m_value.number_float, 1) == 0) o << std::fixed << std::setprecision(1); if (std::fmod(m_value.number_float, 1) == 0) o << std::fixed << std::setprecision(1);
else o << std::defaultfloat << std::setprecision(std::numeric_limits<double>::digits10); else {
o.unsetf(std::ios_base::floatfield); // std::defaultfloat not supported in gcc version < 5
o << std::setprecision(std::numeric_limits<double>::digits10);
}
o << m_value.number_float; o << m_value.number_float;
return; return;
} }