diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2003-03-31 20:24:13 +0200 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-03-31 18:24:13 +0000 |
| commit | eb98bd16ce5ada9df54e4340b8cbf86b45d385f2 (patch) | |
| tree | 73484defd3a0008256a22e753fae73b6b37914c4 /libstdc++-v3/include/bits/streambuf.tcc | |
| parent | c8ae788f59f209e7015fdf6c5933fcb8ef558700 (diff) | |
| download | gcc-eb98bd16ce5ada9df54e4340b8cbf86b45d385f2.zip gcc-eb98bd16ce5ada9df54e4340b8cbf86b45d385f2.tar.gz gcc-eb98bd16ce5ada9df54e4340b8cbf86b45d385f2.tar.bz2 | |
std_streambuf.h (_M_out_buf_size()): Remove.
2003-03-31 Paolo Carlini <pcarlini@unitus.it>
* include/std/std_streambuf.h (_M_out_buf_size()): Remove.
* include/bits/fstream.tcc (_M_allocate_internal_buffer):
Don't set _M_out_end.
(basic_filebuf::overflow): Replace _M_out_buf_size() with
this->_M_out_cur && this->_M_out_cur < this->_M_out_end.
* include/bits/sstream.tcc (basic_stringbuf::overflow):
Replace _M_out_buf_size() with this->_M_out_cur < this->_M_out_end;
* include/bits/streambuf.tcc (basic_streambuf::sputc):
Replace _M_out_buf_size() with _M_out_cur && _M_out_cur < _M_out_end.
(basic_streambuf::xsputn): Replace _M_out_buf_size() with
_M_out_end - _M_out_cur.
(__copy_streambufs): Likewise.
* include/std/std_fstream.h (_M_set_determinate): Set
_M_out_end here.
From-SVN: r65093
Diffstat (limited to 'libstdc++-v3/include/bits/streambuf.tcc')
| -rw-r--r-- | libstdc++-v3/include/bits/streambuf.tcc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc index 6e9d192..47fc4ec 100644 --- a/libstdc++-v3/include/bits/streambuf.tcc +++ b/libstdc++-v3/include/bits/streambuf.tcc @@ -99,7 +99,7 @@ namespace std sputc(char_type __c) { int_type __ret; - if (_M_out_buf_size()) + if (_M_out_cur && _M_out_cur < _M_out_end) { *_M_out_cur = __c; _M_out_cur_move(1); @@ -152,7 +152,7 @@ namespace std streamsize __ret = 0; while (__ret < __n) { - off_type __buf_len = _M_out_buf_size(); + off_type __buf_len = _M_out_end - _M_out_cur; if (__buf_len > 0) { off_type __remaining = __n - __ret; @@ -189,11 +189,12 @@ namespace std basic_streambuf<_CharT, _Traits>* __sbout) { typedef typename _Traits::int_type int_type; + typedef typename _Traits::off_type off_type; streamsize __ret = 0; streamsize __bufsize = __sbin->in_avail(); streamsize __xtrct; - const typename _Traits::off_type __size_opt = + const off_type __size_opt = __sbin->_M_buf_size_opt > 0 ? __sbin->_M_buf_size_opt : 1; try @@ -213,7 +214,8 @@ namespace std { streamsize __charsread; const streamsize __size = - std::min(__size_opt, __sbout->_M_out_buf_size()); + std::min(__size_opt, off_type(__sbout->_M_out_end - + __sbout->_M_out_cur)); if (__size > 1) { _CharT* __buf = |