1
0
mirror of https://github.com/nlohmann/json synced 2024-11-27 06:10:06 +00:00

revert changes to master

This commit is contained in:
Niels 2016-04-05 20:47:47 +02:00
parent 44a8e9bf35
commit 43ee70cef8
2 changed files with 0 additions and 20 deletions

View File

@ -2148,7 +2148,6 @@ class basic_json
string_t dump(const int indent = -1) const string_t dump(const int indent = -1) const
{ {
std::stringstream ss; std::stringstream ss;
ss.imbue(std::locale("C"));
if (indent >= 0) if (indent >= 0)
{ {
@ -5654,20 +5653,11 @@ class basic_json
const bool pretty_print = (o.width() > 0); const bool pretty_print = (o.width() > 0);
const auto indentation = (pretty_print ? o.width() : 0); const auto indentation = (pretty_print ? o.width() : 0);
// save locale of o
auto old_locale = o.getloc();
// set locale of o to "C"
o.imbue(std::locale("C"));
// reset width to 0 for subsequent calls to this stream // reset width to 0 for subsequent calls to this stream
o.width(0); o.width(0);
// do the actual serialization // do the actual serialization
j.dump(o, pretty_print, static_cast<unsigned int>(indentation)); j.dump(o, pretty_print, static_cast<unsigned int>(indentation));
// reset locale
o.imbue(old_locale);
return o; return o;
} }

View File

@ -2148,7 +2148,6 @@ class basic_json
string_t dump(const int indent = -1) const string_t dump(const int indent = -1) const
{ {
std::stringstream ss; std::stringstream ss;
ss.imbue(std::locale("C"));
if (indent >= 0) if (indent >= 0)
{ {
@ -5654,20 +5653,11 @@ class basic_json
const bool pretty_print = (o.width() > 0); const bool pretty_print = (o.width() > 0);
const auto indentation = (pretty_print ? o.width() : 0); const auto indentation = (pretty_print ? o.width() : 0);
// save locale of o
auto old_locale = o.getloc();
// set locale of o to "C"
o.imbue(std::locale("C"));
// reset width to 0 for subsequent calls to this stream // reset width to 0 for subsequent calls to this stream
o.width(0); o.width(0);
// do the actual serialization // do the actual serialization
j.dump(o, pretty_print, static_cast<unsigned int>(indentation)); j.dump(o, pretty_print, static_cast<unsigned int>(indentation));
// reset locale
o.imbue(old_locale);
return o; return o;
} }