sstream.tcc (pbackfail): Minor clean up and reformatting, consistent with basic_filebuf::pbackfail.

2003-06-02  Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/sstream.tcc (pbackfail): Minor clean up and
	reformatting, consistent with basic_filebuf::pbackfail.

From-SVN: r67342
This commit is contained in:
Paolo Carlini 2003-06-02 20:24:30 +02:00 committed by Paolo Carlini
parent cc9c608f08
commit 62929dd980
2 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2003-06-02 Paolo Carlini <pcarlini@unitus.it>
* include/bits/sstream.tcc (pbackfail): Minor clean up and
reformatting, consistent with basic_filebuf::pbackfail.
2003-06-02 Richard Kreckel <Richard.Kreckel@GiNaC.DE>
PR libstdc++/11062

View File

@ -47,18 +47,16 @@ namespace std
pbackfail(int_type __c)
{
int_type __ret = traits_type::eof();
const bool __testeof = traits_type::eq_int_type(__c,
traits_type::eof());
const bool __testpos = this->_M_in_beg < this->_M_in_cur;
const bool __testeof = traits_type::eq_int_type(__c, __ret);
// Try to put back __c into input sequence in one of three ways.
// Order these tests done in is unspecified by the standard.
if (__testpos)
if (this->_M_in_beg < this->_M_in_cur)
{
const bool __testeq = traits_type::eq(traits_type::to_char_type(__c),
this->_M_in_cur[-1]);
--this->_M_in_cur;
// Try to put back __c into input sequence in one of three ways.
// Order these tests done in is unspecified by the standard.
if (!__testeof && __testeq)
__ret = __c;
else if (__testeof)