diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-01-30 14:09:58 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-01-30 14:09:58 +0000 |
| commit | 1b27825f0e8bce695410562ac7c0f9e852472bd0 (patch) | |
| tree | 030a889c42d5ac40150378b761b53643c4c014c0 /libstdc++-v3/config/locale | |
| parent | 0587624297f965c28245aca6f1ca1b09b681faa6 (diff) | |
| download | gcc-1b27825f0e8bce695410562ac7c0f9e852472bd0.tar.gz | |
2005-01-30 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/19642
* config/locale/generic/c_locale.h (__convert_from_v): Switch only
LC_NUMERIC, and only when actually != "C".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94440 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/config/locale')
| -rw-r--r-- | libstdc++-v3/config/locale/generic/c_locale.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index a1a56868613..7b2282b04f6 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -59,18 +59,26 @@ namespace std const char* __fmt, _Tv __v, const __c_locale&, int __prec) { - char* __old = std::setlocale(LC_ALL, NULL); - char* __sav = new char[std::strlen(__old) + 1]; - std::strcpy(__sav, __old); - std::setlocale(LC_ALL, "C"); + char* __old = std::setlocale(LC_NUMERIC, NULL); + char* __sav = NULL; + if (std::strcmp(__old, "C")) + { + __sav = new char[std::strlen(__old) + 1]; + std::strcpy(__sav, __old); + std::setlocale(LC_NUMERIC, "C"); + } #ifdef _GLIBCXX_USE_C99 const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v); #else const int __ret = std::sprintf(__out, __fmt, __prec, __v); #endif - std::setlocale(LC_ALL, __sav); - delete [] __sav; + + if (__sav) + { + std::setlocale(LC_NUMERIC, __sav); + delete [] __sav; + } return __ret; } } |