diff options
| author | Nathan Myers <ncm@cantrip.org> | 2007-01-25 13:08:51 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-01-25 13:08:51 +0000 |
| commit | 6bfcbf0d48e8e9e71abb7302f677ab5bd32286e0 (patch) | |
| tree | 0162965fa3f762d4d58435d0305ce61af02392f8 | |
| parent | 16c1c158d80c9ebc5b72c89fbe16c6622e8c35cf (diff) | |
| download | gcc-6bfcbf0d48e8e9e71abb7302f677ab5bd32286e0.tar.gz | |
streambuf_iterator.h (istreambuf_iterator<>::equal): Simplify.
2007-01-25 Nathan Myers <ncm@cantrip.org>
* include/bits/streambuf_iterator.h (istreambuf_iterator<>::equal):
Simplify.
From-SVN: r121170
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/streambuf_iterator.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bcc305670d1..24034fa240a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-01-25 Nathan Myers <ncm@cantrip.org> + + * include/bits/streambuf_iterator.h (istreambuf_iterator<>::equal): + Simplify. + 2007-01-24 Steve LoBasso <slobasso@yahoo.com> Paolo Carlini <pcarlini@suse.de> diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h index c743bb311ba..26cc00f8b22 100644 --- a/libstdc++-v3/include/bits/streambuf_iterator.h +++ b/libstdc++-v3/include/bits/streambuf_iterator.h @@ -157,11 +157,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /// Return true both iterators are end or both are not end. bool equal(const istreambuf_iterator& __b) const - { - const bool __thiseof = _M_at_eof(); - const bool __beof = __b._M_at_eof(); - return ((__thiseof && __beof) || (!__thiseof && !__beof)); - } + { return _M_at_eof() == __b._M_at_eof(); } private: int_type |