git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Paolo Carlini 2006-10-17 16:43:47 +00:00 committed by Paolo Carlini
parent 8f407473ac
commit b3b3633323
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
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> 2006-10-17 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/26020 PR libstdc++/26020

21
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -1537,10 +1537,8 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
ios_base::iostate& __err, double& __units) const ios_base::iostate& __err, double& __units) const
{ {
string __str; string __str;
if (__intl) __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str)
__beg = _M_extract<true>(__beg, __end, __io, __err, __str); : _M_extract<false>(__beg, __end, __io, __err, __str);
else
__beg = _M_extract<false>(__beg, __end, __io, __err, __str);
std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale()); std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale());
return __beg; return __beg;
} }
@ -1553,10 +1551,8 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
ios_base::iostate& __err, long double& __units) const ios_base::iostate& __err, long double& __units) const
{ {
string __str; string __str;
if (__intl) __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str)
__beg = _M_extract<true>(__beg, __end, __io, __err, __str); : _M_extract<false>(__beg, __end, __io, __err, __str);
else
__beg = _M_extract<false>(__beg, __end, __io, __err, __str);
std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale()); std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale());
return __beg; return __beg;
} }
@ -1573,18 +1569,15 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc); const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
string __str; string __str;
const iter_type __ret = __intl ? _M_extract<true>(__beg, __end, __io, __beg = __intl ? _M_extract<true>(__beg, __end, __io, __err, __str)
__err, __str) : _M_extract<false>(__beg, __end, __io, __err, __str);
: _M_extract<false>(__beg, __end, __io,
__err, __str);
const size_type __len = __str.size(); const size_type __len = __str.size();
if (__len) if (__len)
{ {
__digits.resize(__len); __digits.resize(__len);
__ctype.widen(__str.data(), __str.data() + __len, &__digits[0]); __ctype.widen(__str.data(), __str.data() + __len, &__digits[0]);
} }
return __beg;
return __ret;
} }
template<typename _CharT, typename _OutIter> template<typename _CharT, typename _OutIter>