From 7214243d89b166d8b52c18a997720a5fe4be2fe6 Mon Sep 17 00:00:00 2001 From: Niels Date: Tue, 28 Jun 2016 19:18:23 +0200 Subject: [PATCH] reset locale (for #272) --- src/json.hpp | 5 ++++- src/json.hpp.re2c | 5 ++++- test/src/unit.cpp | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index 3c57c42f8..7adcbb430 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -5658,10 +5658,13 @@ class basic_json // reset width to 0 for subsequent calls to this stream o.width(0); // fix locale problems - o.imbue(std::locale(std::locale(), new DecimalSeparator)); + auto old_locale = o.imbue(std::locale(std::locale(), new DecimalSeparator)); // do the actual serialization j.dump(o, pretty_print, static_cast(indentation)); + + // reset locale + o.imbue(old_locale); return o; } diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 63141e202..4b86afd6b 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -5658,10 +5658,13 @@ class basic_json // reset width to 0 for subsequent calls to this stream o.width(0); // fix locale problems - o.imbue(std::locale(std::locale(), new DecimalSeparator)); + auto old_locale = o.imbue(std::locale(std::locale(), new DecimalSeparator)); // do the actual serialization j.dump(o, pretty_print, static_cast(indentation)); + + // reset locale + o.imbue(old_locale); return o; } diff --git a/test/src/unit.cpp b/test/src/unit.cpp index af16f00d2..1f5c6d9ff 100644 --- a/test/src/unit.cpp +++ b/test/src/unit.cpp @@ -14079,9 +14079,15 @@ TEST_CASE("regression tests") CHECK(j1a.dump() == "23.42"); CHECK(j1b.dump() == "23.42"); + // check if locale is properly reset std::stringstream ss; + ss.imbue(std::locale(std::locale(), new CommaDecimalSeparator)); + ss << 47.11; + CHECK(ss.str() == "47,11"); ss << j1a; - CHECK(ss.str() == "23.42"); + CHECK(ss.str() == "47,1123.42"); + ss << 47.11; + CHECK(ss.str() == "47,1123.4247,11"); CHECK(j2a.dump() == "23.42"); //issue #230