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

🐛 fixing #359

Browse source
This commit is contained in:
Niels 2016-11-21 21:53:10 +01:00
parent 0d72767b3e
commit 43dbe02d5b
2 changed files with 4 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/json.hpp
View file

@ -122,26 +122,6 @@ struct has_mapped_type
std::is_integral<decltype(detect(std::declval<T>()))>::value; std::is_integral<decltype(detect(std::declval<T>()))>::value;
}; };
/*!
@brief helper class to create locales with decimal point
This struct is used a default locale during the JSON serialization. JSON
requires the decimal point to be `.`, so this function overloads the
`do_decimal_point()` function to return `.`. This function is called by
float-to-string conversions to retrieve the decimal separator between integer
and fractional parts.
@sa https://github.com/nlohmann/json/issues/51#issuecomment-86869315
@since version 2.0.0
*/
struct DecimalSeparator : std::numpunct<char>
{
char do_decimal_point() const
{
return '.';
}
};
} }
/*! /*!
@ -2201,8 +2181,7 @@ class basic_json
{ {
std::stringstream ss; std::stringstream ss;
// fix locale problems // fix locale problems
const static std::locale loc(std::locale(), new DecimalSeparator); ss.imbue(std::locale::classic());
ss.imbue(loc);
// 6, 15 or 16 digits of precision allows round-trip IEEE 754 // 6, 15 or 16 digits of precision allows round-trip IEEE 754
// string->float->string, string->double->string or string->long // string->float->string, string->double->string or string->long
@ -5829,7 +5808,7 @@ class basic_json
o.width(0); o.width(0);
// fix locale problems // fix locale problems
const auto old_locale = o.imbue(std::locale(std::locale(), new DecimalSeparator)); const auto old_locale = o.imbue(std::locale::classic());
// set precision // set precision
// 6, 15 or 16 digits of precision allows round-trip IEEE 754 // 6, 15 or 16 digits of precision allows round-trip IEEE 754

25
src/json.hpp.re2c
View file

@ -122,26 +122,6 @@ struct has_mapped_type
std::is_integral<decltype(detect(std::declval<T>()))>::value; std::is_integral<decltype(detect(std::declval<T>()))>::value;
}; };
/*!
@brief helper class to create locales with decimal point
This struct is used a default locale during the JSON serialization. JSON
requires the decimal point to be `.`, so this function overloads the
`do_decimal_point()` function to return `.`. This function is called by
float-to-string conversions to retrieve the decimal separator between integer
and fractional parts.
@sa https://github.com/nlohmann/json/issues/51#issuecomment-86869315
@since version 2.0.0
*/
struct DecimalSeparator : std::numpunct<char>
{
char do_decimal_point() const
{
return '.';
}
};
} }
/*! /*!
@ -2201,8 +2181,7 @@ class basic_json
{ {
std::stringstream ss; std::stringstream ss;
// fix locale problems // fix locale problems
const static std::locale loc(std::locale(), new DecimalSeparator); ss.imbue(std::locale::classic());
ss.imbue(loc);
// 6, 15 or 16 digits of precision allows round-trip IEEE 754 // 6, 15 or 16 digits of precision allows round-trip IEEE 754
// string->float->string, string->double->string or string->long // string->float->string, string->double->string or string->long
@ -5829,7 +5808,7 @@ class basic_json
o.width(0); o.width(0);
// fix locale problems // fix locale problems
const auto old_locale = o.imbue(std::locale(std::locale(), new DecimalSeparator)); const auto old_locale = o.imbue(std::locale::classic());
// set precision // set precision
// 6, 15 or 16 digits of precision allows round-trip IEEE 754 // 6, 15 or 16 digits of precision allows round-trip IEEE 754