diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-14 19:14:39 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-14 19:14:39 +0000 |
| commit | bd5c892b782e057ad3e5df85928283a95d1642b4 (patch) | |
| tree | ba1d8461de3c6501263580b5bd02455bbd808a51 /libstdc++-v3/config/locale/generic/numeric_members.cc | |
| parent | e078ec05a608fc762b03cca5e17cec0a0528a567 (diff) | |
| download | ppe42-gcc-bd5c892b782e057ad3e5df85928283a95d1642b4.tar.gz ppe42-gcc-bd5c892b782e057ad3e5df85928283a95d1642b4.zip | |
2004-01-14 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.h (struct __numpunct_cache):
Add member _M_grouping_size, caching the length of _M_grouping.
(__numpunct_cache<>::_M_cache): Assign the latter.
(__verify_grouping): Move declaration...
* include/bits/locale_facets.tcc (__verify_grouping):
... here, change signature to take a const char* and a size_t
for the grouping; not a template anymore.
(__add_grouping, num_put::_M_group_int, num_put::_M_group_float):
Likewise change signature and tweak consistently.
(num_get::_M_extract_float, num_get::_M_extract_int,
num_put::_M_insert_int, num_put::_M_insert_float,
money_get::do_get(string_type&), money_get::do_put(string_type)):
Update callers.
* config/locale/generic/numeric_members.cc
(numpunct<>::_M_initialize_numpunct): Assign the new member.
* config/locale/gnu/numeric_members.cc
(numpunct<>::_M_initialize_numpunct): Likewise.
* src/locale-inst.cc (__add_grouping): Tweak signature.
(__verify_grouping): Don't instantiate, not a template anymore.
* include/bits/locale_facets.h: Rename _M_truename_len ->
_M_truename_size, _M_falsename_len -> _M_falsename_size.
* include/bits/locale_facets.tcc: Likewise.
* config/locale/generic/numeric_members.cc: Likewise.
* config/locale/gnu/numeric_members.cc: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75876 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/config/locale/generic/numeric_members.cc')
| -rw-r--r-- | libstdc++-v3/config/locale/generic/numeric_members.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libstdc++-v3/config/locale/generic/numeric_members.cc b/libstdc++-v3/config/locale/generic/numeric_members.cc index 72760aee0d0..06458659715 100644 --- a/libstdc++-v3/config/locale/generic/numeric_members.cc +++ b/libstdc++-v3/config/locale/generic/numeric_members.cc @@ -57,10 +57,12 @@ namespace std 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_grouping_size = strlen(_M_data->_M_grouping); + _M_data->_M_truename = "true"; - _M_data->_M_truename_len = strlen(_M_data->_M_truename); + _M_data->_M_truename_size = strlen(_M_data->_M_truename); _M_data->_M_falsename = "false"; - _M_data->_M_falsename_len = strlen(_M_data->_M_falsename); + _M_data->_M_falsename_size = strlen(_M_data->_M_falsename); } template<> @@ -95,11 +97,13 @@ namespace std uc = static_cast<unsigned char>(__num_base::_S_atoms_in[__i]); _M_data->_M_atoms_in[__i] = btowc(uc); } - + + _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); + _M_data->_M_truename = L"true"; - _M_data->_M_truename_len = wcslen(_M_data->_M_truename); + _M_data->_M_truename_size = wcslen(_M_data->_M_truename); _M_data->_M_falsename = L"false"; - _M_data->_M_falsename_len = wcslen(_M_data->_M_falsename); + _M_data->_M_falsename_size = wcslen(_M_data->_M_falsename); } template<> |
