OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fstream.tcc (pbackfail): Shorten a bit (10 lines) the innermost 'if' by factoring out some code. 

2003-04-26  Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/fstream.tcc (pbackfail): Shorten a bit (10 lines)
	the innermost 'if' by factoring out some code.

From-SVN: r66102
This commit is contained in:
Paolo Carlini 2003-04-26 10:31:57 +02:00 committed by Paolo Carlini
parent ac5b7972ab
commit c7f79b4cb2
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2003-04-26 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (pbackfail): Shorten a bit (10 lines)
the innermost 'if' by factoring out some code.
2003-04-26 Paolo Carlini <pcarlini@unitus.it>
* include/bits/streambuf.tcc (__copy_streambufs): Don't

22
libstdc++-v3/include/bits/fstream.tcc
View File

@ -203,27 +203,17 @@ namespace std
const bool __testout = this->_M_mode & ios_base::out;
const bool __testeq = traits_type::eq(__c, this->_M_in_cur[-1]);
--this->_M_in_cur;
if (__testout)
--this->_M_out_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)
{
--this->_M_in_cur;
if (__testout)
--this->_M_out_cur;
__ret = __i;
}
__ret = __i;
else if (__testeof)
__ret = traits_type::not_eof(__i);
else
{
--this->_M_in_cur;
if (__testout)
--this->_M_out_cur;
__ret = traits_type::not_eof(__i);
}
else if (!__testeof)
{
--this->_M_in_cur;
if (__testout)
--this->_M_out_cur;
_M_pback_create();
*this->_M_in_cur = __c;
__ret = __i;