fstream.tcc (pbackfail): Make a rarely taken 'if' branch less obscure.

2003-06-03  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/fstream.tcc (pbackfail): Make a rarely taken
	'if' branch less obscure.

From-SVN: r67394
This commit is contained in:
Benjamin Kosnik 2003-06-03 18:06:09 +00:00 committed by Paolo Carlini
parent 6d07784ac2
commit f24ce7c1c3
2 changed files with 12 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2003-06-03 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/fstream.tcc (pbackfail): Make a rarely taken
'if' branch less obscure.
2003-06-02 Andrew Pinski <pinskia@physics.uc.edu>
PR libstdc++/9815

View file

@ -284,9 +284,13 @@ namespace std
// But the seek may fail (f.i., at the beginning of
// a file, see libstdc++/9439) and in that case
// we return traits_type::eof().
else if (this->seekoff(-1, ios_base::cur) < 0
|| traits_type::eq_int_type(__tmp = this->underflow(),
traits_type::eof()))
else if (this->seekoff(-1, ios_base::cur) >= 0)
{
__tmp = this->underflow();
if (traits_type::eq_int_type(__tmp, __ret))
return __ret;
}
else
return __ret;
// Try to put back __i into input sequence in one of three ways.