+2004-11-24 Nathan Myers <ncm@cantrip.org>
+
+ * include/bits/streambuf_iterator.h
+ (istreambuf_iterator<>::operator++(), operator++(int)): Don't
+ check unnecessarily the return value of _M_sbuf->sbumpc().
+
2004-11-24 Benjamin Kosnik <bkoz@redhat.com>
* include/Makefile.am (tr1_headers): Add utility, functional.
__glibcxx_requires_cond(!_M_at_eof(),
_M_message(__gnu_debug::__msg_inc_istreambuf)
._M_iterator(*this));
- const int_type __eof = traits_type::eof();
- if (_M_sbuf && traits_type::eq_int_type(_M_sbuf->sbumpc(), __eof))
- _M_sbuf = 0;
- else
- _M_c = __eof;
+ if (_M_sbuf)
+ {
+ _M_sbuf->sbumpc();
+ _M_c = traits_type::eof();
+ }
return *this;
}
_M_message(__gnu_debug::__msg_inc_istreambuf)
._M_iterator(*this));
- const int_type __eof = traits_type::eof();
istreambuf_iterator __old = *this;
- if (_M_sbuf
- && traits_type::eq_int_type((__old._M_c = _M_sbuf->sbumpc()),
- __eof))
- _M_sbuf = 0;
- else
- _M_c = __eof;
+ if (_M_sbuf)
+ {
+ __old._M_c = _M_sbuf->sbumpc();
+ _M_c = traits_type::eof();
+ }
return __old;
}