diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2003-04-21 23:44:44 +0200 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-04-21 21:44:44 +0000 |
| commit | 07c2b60df9e41bcb144a0d0d048f6044f8a36754 (patch) | |
| tree | 712fb1d95e06ab7ade2c9c54c8dae5d8908fb9d4 /libstdc++-v3/include/bits/streambuf.tcc | |
| parent | 63f60ecb140af7ca96f4971ab2e190a3d3d6e389 (diff) | |
| download | gcc-07c2b60df9e41bcb144a0d0d048f6044f8a36754.tar.gz | |
Consistently use _M_in_beg instead of eback(), _M_in_cur instead of gptr(), and so on.
2003-04-21 Paolo Carlini <pcarlini@unitus.it>
Consistently use _M_in_beg instead of eback(), _M_in_cur
instead of gptr(), and so on.
* include/bits/fstream.tcc (pbackfail, imbue): Here.
* include/bits/sstream.tcc (pbackfail, seekoff, seekpos): Ditto.
* include/bits/streambuf.tcc (sbumpc, sputbackc,
__copy_streambufs): Ditto.
* include/std/std_streambuf.h (sgetc): Ditto.
From-SVN: r65909
Diffstat (limited to 'libstdc++-v3/include/bits/streambuf.tcc')
| -rw-r--r-- | libstdc++-v3/include/bits/streambuf.tcc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc index 09dd14ce876..06e2f504704 100644 --- a/libstdc++-v3/include/bits/streambuf.tcc +++ b/libstdc++-v3/include/bits/streambuf.tcc @@ -51,7 +51,7 @@ namespace std int_type __ret; if (_M_in_cur < _M_in_end) { - char_type __c = *(this->gptr()); + char_type __c = *this->_M_in_cur; _M_in_cur_move(1); __ret = traits_type::to_int_type(__c); } @@ -67,12 +67,12 @@ namespace std { int_type __ret; const bool __testpos = _M_in_beg < _M_in_cur; - if (!__testpos || !traits_type::eq(__c, this->gptr()[-1])) + if (!__testpos || !traits_type::eq(__c, this->_M_in_cur[-1])) __ret = this->pbackfail(traits_type::to_int_type(__c)); else { _M_in_cur_move(-1); - __ret = traits_type::to_int_type(*this->gptr()); + __ret = traits_type::to_int_type(*this->_M_in_cur); } return __ret; } @@ -201,10 +201,10 @@ namespace std { while (__in_avail != -1) { - if (__in_avail != 0 && __sbin->gptr() - && __sbin->gptr() + __in_avail <= __sbin->egptr()) + if (__in_avail != 0 && __sbin->_M_in_cur + && __sbin->_M_in_cur + __in_avail <= __sbin->_M_in_end) { - __xtrct = __sbout->sputn(__sbin->gptr(), __in_avail); + __xtrct = __sbout->sputn(__sbin->_M_in_cur, __in_avail); __ret += __xtrct; __sbin->_M_in_cur_move(__xtrct); if (__xtrct != __in_avail) |