From 62929dd980996e79b9e4668b31c4a7fa48b0bef7 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 2 Jun 2003 20:24:30 +0200 Subject: [PATCH] sstream.tcc (pbackfail): Minor clean up and reformatting, consistent with basic_filebuf::pbackfail. 2003-06-02 Paolo Carlini * include/bits/sstream.tcc (pbackfail): Minor clean up and reformatting, consistent with basic_filebuf::pbackfail. From-SVN: r67342 --- libstdc++-v3/ChangeLog | 5 +++++ 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 + + * include/bits/sstream.tcc (pbackfail): Minor clean up and + reformatting, consistent with basic_filebuf::pbackfail. + 2003-06-02 Richard Kreckel 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)