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

fstream.tcc (_M_underflow): simplify...

Browse Source 
2003-05-22  Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/fstream.tcc (_M_underflow): simplify:
	!__testout implies _M_filepos == _M_in_end, therefore
	the first _M_file.seekoff call is never issued.

From-SVN: r67094
This commit is contained in:
Paolo Carlini 2003-05-22 20:44:02 +02:00 committed by Paolo Carlini
parent 1f85a61235
commit 0aef8de2ae
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2003-05-22 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (_M_underflow): simplify:
!__testout implies _M_filepos == _M_in_end, therefore
the first _M_file.seekoff call is never issued.
2003-05-22 Benjamin Kosnik <bkoz@redhat.com> 2003-05-22 Benjamin Kosnik <bkoz@redhat.com>
* configure.in: Sort cross table. * configure.in: Sort cross table.

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

@ -196,8 +196,7 @@ namespace std
// Check for pback madness, and if so swich back to the // Check for pback madness, and if so swich back to the
// normal buffers and jet outta here before expensive // normal buffers and jet outta here before expensive
// fileops happen... // fileops happen...
if (_M_pback_init) _M_destroy_pback();
_M_destroy_pback();
if (this->_M_in_cur < this->_M_in_end) if (this->_M_in_cur < this->_M_in_end)
{ {
@ -208,15 +207,8 @@ namespace std
} }
// Sync internal and external buffers. // Sync internal and external buffers.
// NB: __testget -> __testput as _M_buf_unified here. if (__testout && this->_M_out_beg < this->_M_out_lim)
if (this->_M_in_cur > this->_M_in_beg) _M_overflow();
{
if (__testout)
_M_overflow();
else if (this->_M_in_cur != _M_filepos)
_M_file.seekoff(this->_M_in_cur - _M_filepos, ios_base::cur,
ios_base::in);
}
if (_M_buf_size > 1) if (_M_buf_size > 1)
{ {