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

istream.tcc (ignore): Remove redundant line. 

2004-05-21  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/istream.tcc (ignore): Remove redundant line.
	(readsome): Tidy, closely following 27.6.1.3, p30.

From-SVN: r82103
This commit is contained in:
Paolo Carlini 2004-05-21 17:16:21 +00:00 committed by Paolo Carlini
parent b953ebd647
commit 32da620821
2 changed files with 9 additions and 9 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 @@
2004-05-21 Paolo Carlini <pcarlini@suse.de>
* include/bits/istream.tcc (ignore): Remove redundant line.
(readsome): Tidy, closely following 27.6.1.3, p30.
2004-05-20 Paolo Carlini <pcarlini@suse.de>
* include/bits/istream.tcc (operator>>(basic_istream<>&,

13
libstdc++-v3/include/bits/istream.tcc
View File

@ -659,7 +659,6 @@ namespace std
__streambuf_type* __sb = this->rdbuf();
int_type __c;
__n = std::min(__n, numeric_limits<streamsize>::max());
while (_M_gcount < __n
&& !traits_type::eq_int_type(__c = __sb->sbumpc(), __eof))
{
@ -740,14 +739,10 @@ namespace std
try
{
// Cannot compare int_type with streamsize generically.
streamsize __num = this->rdbuf()->in_avail();
if (__num >= 0)
{
__num = std::min(__num, __n);
if (__num)
_M_gcount = this->rdbuf()->sgetn(__s, __num);
}
else
const streamsize __num = this->rdbuf()->in_avail();
if (__num > 0)
_M_gcount = this->rdbuf()->sgetn(__s, std::min(__num, __n));
else if (__num == -1)
__err |= ios_base::eofbit;
}
catch(...)