From: Benjamin Kosnik <bkoz@gcc.gnu.org>
Date: Tue, 13 Jun 2000 23:48:02 +0000 (+0000)
Subject: stl_iterator.h: Added inline to operators == to >=.
X-Git-Tag: prereleases/libstdc++-2.92~5832
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=8173b2d78a179d12405438b4c9135cb20e8af68c;p=gcc.git

stl_iterator.h: Added inline to operators == to >=.


2000-06-13  Thomas Holenstein  <thomas@hex.ch>

        * bits/stl_iterator.h: Added inline to operators == to >=.

From-SVN: r34534
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 688b84b675ad..535a38a9547f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,25 @@
+2000-06-13  Anthony Williams  <anthony@anthonyw.cjb.net>
+
+	* testsuite/23_containers/bitset_ctor.cc: Qualify reverse wth std::.
+
+	* testsuite/27_io/filebuf.cc: Changed calls to
+	fpos<>._M_position() to implicit calls to operator streamoff().
+	* testsuite/27_io/iostream_objects.cc: Removed #include <ciso646>,
+	as not needed. Revert, as part of standard.
+	* testsuite/27_io/ostream_inserter_arith.cc: Replaced explicit
+	call to numpunct<>._M_init() with overrides of the appropriate
+	virtual functions.
+
+	* testsuite/27_io/stringstream.cc: Removed unnecessary char *
+	pointers from test01, so no need to call base(), which isn't
+	guaranteed to be implemented as iterators may themselves be pointers
+	* testsuite/27_io/stringbuf.cc: Removed unnecessary calls to
+	_M_position() - use implicit conversion to streamoff instead
+
+2000-06-13  Thomas Holenstein  <thomas@hex.ch>
+ 
+        * bits/stl_iterator.h: Added inline to operators == to >=.
+
 2000-06-13  Brent Verner <brent@rcfile.org>
 
 	* bits/streambuf.tcc: repaired _S_copy_streambufs()
diff --git a/libstdc++-v3/bits/stl_iterator.h b/libstdc++-v3/bits/stl_iterator.h
index 289cbe6ea051..d6d96f32b4ef 100644
--- a/libstdc++-v3/bits/stl_iterator.h
+++ b/libstdc++-v3/bits/stl_iterator.h
@@ -1043,35 +1043,41 @@ public:
 // forward iterator requirements
 
 template<typename _IteratorL, typename _IteratorR, typename _Container>
-bool operator==(const __normal_iterator<_IteratorL, _Container>& __lhs,
-                const __normal_iterator<_IteratorR, _Container>& __rhs)
+inline bool
+operator==(const __normal_iterator<_IteratorL, _Container>& __lhs,
+	   const __normal_iterator<_IteratorR, _Container>& __rhs)
 { return __lhs.base() == __rhs.base(); }
 
 template<typename _IteratorL, typename _IteratorR, typename _Container>
-bool operator!=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-                const __normal_iterator<_IteratorR, _Container>& __rhs)
+inline bool
+operator!=(const __normal_iterator<_IteratorL, _Container>& __lhs,
+	   const __normal_iterator<_IteratorR, _Container>& __rhs)
 { return !(__lhs == __rhs); }
 
 // random access iterator requirements
 
 template<typename _IteratorL, typename _IteratorR, typename _Container>
-bool operator<(const __normal_iterator<_IteratorL, _Container>& __lhs,
-               const __normal_iterator<_IteratorR, _Container>& __rhs)
+inline bool 
+operator<(const __normal_iterator<_IteratorL, _Container>& __lhs,
+	  const __normal_iterator<_IteratorR, _Container>& __rhs)
 { return __lhs.base() < __rhs.base(); }
 
 template<typename _IteratorL, typename _IteratorR, typename _Container>
-bool operator>(const __normal_iterator<_IteratorL, _Container>& __lhs,
-               const __normal_iterator<_IteratorR, _Container>& __rhs)
+inline bool
+operator>(const __normal_iterator<_IteratorL, _Container>& __lhs,
+	  const __normal_iterator<_IteratorR, _Container>& __rhs)
 { return __rhs < __lhs; }
 
 template<typename _IteratorL, typename _IteratorR, typename _Container>
-bool operator<=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-                const __normal_iterator<_IteratorR, _Container>& __rhs)
+inline bool
+operator<=(const __normal_iterator<_IteratorL, _Container>& __lhs,
+	   const __normal_iterator<_IteratorR, _Container>& __rhs)
 { return !(__rhs < __lhs); }
 
 template<typename _IteratorL, typename _IteratorR, typename _Container>
-bool operator>=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-                const __normal_iterator<_IteratorR, _Container>& __rhs)
+inline bool
+operator>=(const __normal_iterator<_IteratorL, _Container>& __lhs,
+	   const __normal_iterator<_IteratorR, _Container>& __rhs)
 { return !(__lhs < __rhs); }
 
 template<typename _Iterator, typename _Container>