diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-12 08:36:23 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-12 08:36:23 +0000 |
| commit | 1beff22e49a49de5806ed7d030912715971288d4 (patch) | |
| tree | f0702c9126ddfbe6a946243cc3b8c527b2508d34 /libstdc++-v3 | |
| parent | abeddb91c6e18b26afc2952afa187347665d18ff (diff) | |
| download | gcc-1beff22e49a49de5806ed7d030912715971288d4.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80618 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -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 40d7eb50050..9e545ce8bc3 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 02b57b4635e..ef1f5bf5703 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 { |