diff options
| author | 2020-10-09 00:05:01 -0700 | |
|---|---|---|
| committer | 2020-10-09 00:05:01 -0700 | |
| commit | 7b1df38bd0ff7b17eed3d1709b67bd7eda210efc (patch) | |
| tree | 26cec39203907463da4f6873290cfafe74aa9f97 /src/lib/util/xmlfile.cpp | |
| parent | 1b399b9e9b891b1a53290cdfdaa76b796ce1fd82 (diff) | |
| parent | ac04c377a995c1d87fc889ad98ff772838bcf31f (diff) | |
Merge branch 'master' into aaron-nl3
Diffstat (limited to 'src/lib/util/xmlfile.cpp')
| -rw-r--r-- | src/lib/util/xmlfile.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/util/xmlfile.cpp b/src/lib/util/xmlfile.cpp index a61c20d2e3c..8ee3c33fe26 100644 --- a/src/lib/util/xmlfile.cpp +++ b/src/lib/util/xmlfile.cpp @@ -31,7 +31,6 @@ namespace { ***************************************************************************/ constexpr unsigned TEMP_BUFFER_SIZE(4096U); -std::locale const f_portable_locale("C"); /*************************************************************************** @@ -629,7 +628,7 @@ long long data_node::get_attribute_int(const char *attribute, long long defvalue return defvalue; std::istringstream stream; - stream.imbue(f_portable_locale); + stream.imbue(std::locale::classic()); long long result; if (string[0] == '$') { @@ -694,7 +693,7 @@ float data_node::get_attribute_float(const char *attribute, float defvalue) cons return defvalue; std::istringstream stream(string); - stream.imbue(f_portable_locale); + stream.imbue(std::locale::classic()); float result; return (stream >> result) ? result : defvalue; } @@ -732,7 +731,7 @@ void data_node::set_attribute(const char *name, const char *value) void data_node::set_attribute_int(const char *name, long long value) { - set_attribute(name, string_format(f_portable_locale, "%d", value).c_str()); + set_attribute(name, string_format(std::locale::classic(), "%d", value).c_str()); } @@ -743,7 +742,7 @@ void data_node::set_attribute_int(const char *name, long long value) void data_node::set_attribute_float(const char *name, float value) { - set_attribute(name, string_format(f_portable_locale, "%f", value).c_str()); + set_attribute(name, string_format(std::locale::classic(), "%f", value).c_str()); } |
