diff options
Diffstat (limited to 'contrib/libstdc++/config/locale/generic/numeric_members.cc')
-rw-r--r-- | contrib/libstdc++/config/locale/generic/numeric_members.cc | 66 |
1 files changed, 52 insertions, 14 deletions
diff --git a/contrib/libstdc++/config/locale/generic/numeric_members.cc b/contrib/libstdc++/config/locale/generic/numeric_members.cc index f942e04..e2afed9 100644 --- a/contrib/libstdc++/config/locale/generic/numeric_members.cc +++ b/contrib/libstdc++/config/locale/generic/numeric_members.cc @@ -1,6 +1,6 @@ // std::numpunct implementation details, generic version -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -42,32 +42,70 @@ namespace std numpunct<char>::_M_initialize_numpunct(__c_locale) { // "C" locale - _M_decimal_point = '.'; - _M_thousands_sep = ','; - _M_grouping = ""; - _M_truename = "true"; - _M_falsename = "false"; + if (!_M_data) + _M_data = new __numpunct_cache<char>; + + _M_data->_M_grouping = ""; + _M_data->_M_grouping_size = 0; + _M_data->_M_use_grouping = false; + + _M_data->_M_decimal_point = '.'; + _M_data->_M_thousands_sep = ','; + + for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) + _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i]; + + for (size_t __i = 0; __i < __num_base::_S_iend; ++__i) + _M_data->_M_atoms_in[__i] = __num_base::_S_atoms_in[__i]; + + _M_data->_M_truename = "true"; + _M_data->_M_truename_size = strlen(_M_data->_M_truename); + _M_data->_M_falsename = "false"; + _M_data->_M_falsename_size = strlen(_M_data->_M_falsename); } template<> numpunct<char>::~numpunct() - { } + { delete _M_data; } -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> void numpunct<wchar_t>::_M_initialize_numpunct(__c_locale) { // "C" locale - _M_decimal_point = L'.'; - _M_thousands_sep = L','; - _M_grouping = ""; - _M_truename = L"true"; - _M_falsename = L"false"; + if (!_M_data) + _M_data = new __numpunct_cache<wchar_t>; + + _M_data->_M_grouping = ""; + _M_data->_M_grouping_size = 0; + _M_data->_M_use_grouping = false; + + _M_data->_M_decimal_point = L'.'; + _M_data->_M_thousands_sep = L','; + + // Use ctype::widen code without the facet... + unsigned char uc; + for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) + { + uc = static_cast<unsigned char>(__num_base::_S_atoms_out[__i]); + _M_data->_M_atoms_out[__i] = btowc(uc); + } + + for (size_t __i = 0; __i < __num_base::_S_iend; ++__i) + { + uc = static_cast<unsigned char>(__num_base::_S_atoms_in[__i]); + _M_data->_M_atoms_in[__i] = btowc(uc); + } + + _M_data->_M_truename = L"true"; + _M_data->_M_truename_size = wcslen(_M_data->_M_truename); + _M_data->_M_falsename = L"false"; + _M_data->_M_falsename_size = wcslen(_M_data->_M_falsename); } template<> numpunct<wchar_t>::~numpunct() - { } + { delete _M_data; } #endif } |