diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/numeric_members.cc | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 40d7eb5..9e545ce 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-04-12 Paolo Carlini <pcarlini@suse.de> + + * config/locale/gnu/numeric_members.cc + (numpunct<wchar_t>::_M_initialize_numpunct): No need to wrap + in __uselocale, since btowc is called for chars belonging to + the basic character set. + 2004-04-09 Paolo Carlini <pcarlini@suse.de> * testsuite/22_locale/messages/members/char/1.cc: Remove junk. diff --git a/libstdc++-v3/config/locale/gnu/numeric_members.cc b/libstdc++-v3/config/locale/gnu/numeric_members.cc index 02b57b4..ef1f5bf 100644 --- a/libstdc++-v3/config/locale/gnu/numeric_members.cc +++ b/libstdc++-v3/config/locale/gnu/numeric_members.cc @@ -106,9 +106,6 @@ namespace std _M_data->_M_decimal_point = L'.'; _M_data->_M_thousands_sep = L','; -#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) - __c_locale __old = __uselocale(_S_get_c_locale()); -#endif // Use ctype::widen code without the facet... unsigned char uc; for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) @@ -122,9 +119,6 @@ namespace std uc = static_cast<unsigned char>(__num_base::_S_atoms_in[__i]); _M_data->_M_atoms_in[__i] = btowc(uc); } -#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) - __uselocale(__old); -#endif } else { |