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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bcc3056..24034fa 100644 (file)
--- 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 c743bb3..26cc00f 100644 (file)
--- 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