diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-10-17 16:43:47 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2006-10-17 16:43:47 +0000 |
| commit | b3b363332380c4306374247285e21a7ac771731b (patch) | |
| tree | 1577d3e8db076128f01622cb31e16d1c6b96b8ff | |
| parent | 8f407473acd4c8eb119704f4fec30a6ed130fdb7 (diff) | |
| download | gcc-b3b363332380c4306374247285e21a7ac771731b.zip gcc-b3b363332380c4306374247285e21a7ac771731b.tar.gz gcc-b3b363332380c4306374247285e21a7ac771731b.tar.bz2 | |
locale_facets.tcc (money_get<>::__do_get(iter_type, iter_type, bool, ios_base&, ios_base::iostate&, double&), [...]): Tidy.
2006-10-17 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (money_get<>::__do_get(iter_type,
iter_type, bool, ios_base&, ios_base::iostate&, double&),
money_get<>::do_get(iter_type, iter_type, bool, ios_base&,
ios_base::iostate&, long double&), money_get<>::do_get(iter_type,
iter_type, bool, ios_base&, ios_base::iostate&, string_type&)): Tidy.
From-SVN: r117828
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_facets.tcc | 21 |
2 files changed, 15 insertions, 14 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ac94e35..5dacf66 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2006-10-17 Paolo Carlini <pcarlini@suse.de> + * include/bits/locale_facets.tcc (money_get<>::__do_get(iter_type, + iter_type, bool, ios_base&, ios_base::iostate&, double&), + money_get<>::do_get(iter_type, iter_type, bool, ios_base&, + ios_base::iostate&, long double&), money_get<>::do_get(iter_type, + iter_type, bool, ios_base&, ios_base::iostate&, string_type&)): Tidy. + +2006-10-17 Paolo Carlini <pcarlini@suse.de> + PR libstdc++/26020 * include/bits/stl_iterator_base_funcs.h (advance): Convert distance parameter to iterator_traits<>::difference_type. diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 49c64a1..d3c47ff 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1537,10 +1537,8 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE ios_base::iostate& __err, double& __units) const { string __str; - if (__intl) - __beg = _M_extract<true>(__beg, __end, __io, __err, __str); - else - __beg = _M_extract<false>(__beg, __end, __io, __err, __str); + __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str) + : _M_extract<false>(__beg, __end, __io, __err, __str); std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale()); return __beg; } @@ -1553,10 +1551,8 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE ios_base::iostate& __err, long double& __units) const { string __str; - if (__intl) - __beg = _M_extract<true>(__beg, __end, __io, __err, __str); - else - __beg = _M_extract<false>(__beg, __end, __io, __err, __str); + __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str) + : _M_extract<false>(__beg, __end, __io, __err, __str); std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale()); return __beg; } @@ -1573,18 +1569,15 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); string __str; - const iter_type __ret = __intl ? _M_extract<true>(__beg, __end, __io, - __err, __str) - : _M_extract<false>(__beg, __end, __io, - __err, __str); + __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str) + : _M_extract<false>(__beg, __end, __io, __err, __str); const size_type __len = __str.size(); if (__len) { __digits.resize(__len); __ctype.widen(__str.data(), __str.data() + __len, &__digits[0]); } - - return __ret; + return __beg; } template<typename _CharT, typename _OutIter> |