diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2005-01-30 14:09:58 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2005-01-30 14:09:58 +0000 |
| commit | d2f64e95fdb0bc89b327325f2b7eeada03547499 (patch) | |
| tree | 030a889c42d5ac40150378b761b53643c4c014c0 | |
| parent | 23e044cc1dc30da08dd53bddd70ca66cbb4ca6c4 (diff) | |
| download | gcc-d2f64e95fdb0bc89b327325f2b7eeada03547499.zip gcc-d2f64e95fdb0bc89b327325f2b7eeada03547499.tar.gz gcc-d2f64e95fdb0bc89b327325f2b7eeada03547499.tar.bz2 | |
re PR libstdc++/19642 (streaming doubles is very slow compared to sprintf)
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".
From-SVN: r94440
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/generic/c_locale.h | 20 |
2 files changed, 20 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b41ead4..63349ec 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +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". + 2005-01-28 Paolo Carlini <pcarlini@suse.de> * include/tr1/type_traits (is_function): Minor consistency tweaks. diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index a1a5686..7b2282b 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; } } |