diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-02 18:24:30 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-02 18:24:30 +0000 |
| commit | ff7023d7299b146fd2638f6da5084500ca3dc332 (patch) | |
| tree | 21fc7c60a064dff0af3e378b31585c5d283ab12b /libstdc++-v3 | |
| parent | 856977c42c60a35e01225b5e880d760cdfc794aa (diff) | |
| download | gcc-ff7023d7299b146fd2638f6da5084500ca3dc332.tar.gz | |
2003-06-02 Paolo Carlini <pcarlini@unitus.it>
* include/bits/sstream.tcc (pbackfail): Minor clean up and
reformatting, consistent with basic_filebuf::pbackfail.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67342 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/sstream.tcc | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 035215fba01..7e204bc4c1b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2003-06-02 Paolo Carlini <pcarlini@unitus.it> + + * include/bits/sstream.tcc (pbackfail): Minor clean up and + reformatting, consistent with basic_filebuf::pbackfail. + 2003-06-02 Richard Kreckel <Richard.Kreckel@GiNaC.DE> PR libstdc++/11062 diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc index b506d184334..49a5aa0106e 100644 --- a/libstdc++-v3/include/bits/sstream.tcc +++ b/libstdc++-v3/include/bits/sstream.tcc @@ -47,18 +47,16 @@ namespace std pbackfail(int_type __c) { int_type __ret = traits_type::eof(); - const bool __testeof = traits_type::eq_int_type(__c, - traits_type::eof()); - const bool __testpos = this->_M_in_beg < this->_M_in_cur; + const bool __testeof = traits_type::eq_int_type(__c, __ret); - // Try to put back __c into input sequence in one of three ways. - // Order these tests done in is unspecified by the standard. - if (__testpos) + if (this->_M_in_beg < this->_M_in_cur) { const bool __testeq = traits_type::eq(traits_type::to_char_type(__c), this->_M_in_cur[-1]); - --this->_M_in_cur; + + // Try to put back __c into input sequence in one of three ways. + // Order these tests done in is unspecified by the standard. if (!__testeof && __testeq) __ret = __c; else if (__testeof) |