From 86b5568b95b7dacc4ab855584f4ccb3be9e270b5 Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 25 Jan 2007 13:08:51 +0000 Subject: [PATCH] 2007-01-25 Nathan Myers * include/bits/streambuf_iterator.h (istreambuf_iterator<>::equal): Simplify. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121170 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ 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 bcc305670d1b..24034fa240ac 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-01-25 Nathan Myers + + * include/bits/streambuf_iterator.h (istreambuf_iterator<>::equal): + Simplify. + 2007-01-24 Steve LoBasso Paolo Carlini diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h index c743bb311ba6..26cc00f8b220 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 -- 2.47.3