diff options
| author | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-06-13 23:48:02 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-06-13 23:48:02 +0000 |
| commit | 8173b2d78a179d12405438b4c9135cb20e8af68c (patch) | |
| tree | 681a1ee1806aa28c9707e9dcd8dee6b6a2976f67 | |
| parent | a032eacb1b30960ed3cbc0fe6de47bd97ec816cc (diff) | |
| download | gcc-8173b2d78a179d12405438b4c9135cb20e8af68c.zip gcc-8173b2d78a179d12405438b4c9135cb20e8af68c.tar.gz gcc-8173b2d78a179d12405438b4c9135cb20e8af68c.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 22 | ||||
| -rw-r--r-- | libstdc++-v3/bits/stl_iterator.h | 30 |
2 files changed, 40 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 688b84b..535a38a 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 289cbe6..d6d96f3 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> |