summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-25 13:08:51 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-25 13:08:51 +0000
commit86b5568b95b7dacc4ab855584f4ccb3be9e270b5 (patch)
tree0162965fa3f762d4d58435d0305ce61af02392f8
parentc81ed7c146d5041a176077a5b351fd83f1e4a830 (diff)
downloadppe42-gcc-86b5568b95b7dacc4ab855584f4ccb3be9e270b5.tar.gz
ppe42-gcc-86b5568b95b7dacc4ab855584f4ccb3be9e270b5.zip
2007-01-25 Nathan Myers <ncm@cantrip.org>
* 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
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/streambuf_iterator.h6
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
OpenPOWER on IntegriCloud