From 6ebf3e359209b78302ae32a458e7aad98304962a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 29 Jan 2004 01:27:02 +0000 Subject: [PATCH] revert: re PR libstdc++/10783 (std::vector::reverse_iterator could be smaller) 2004-01-29 Paolo Carlini * Reverting Sylvain Pion's patch to libstdc++/10783, backported from mainline: probably not safe for the ABI. From-SVN: r76824 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/stl_iterator.h | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3f53b6b44e9e..d0070564becd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-01-29 Paolo Carlini + + * Reverting Sylvain Pion's patch to libstdc++/10783, backported + from mainline: probably not safe for the ABI. + 2004-01-28 Andrew Pinski PR libstdc++/13462 diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 52fe892f8cab..529ad7741756 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -572,15 +572,16 @@ namespace __gnu_cxx using std::iterator; template class __normal_iterator + : public iterator::iterator_category, + typename iterator_traits<_Iterator>::value_type, + typename iterator_traits<_Iterator>::difference_type, + typename iterator_traits<_Iterator>::pointer, + typename iterator_traits<_Iterator>::reference> { protected: _Iterator _M_current; public: - typedef typename iterator_traits<_Iterator>::iterator_category - iterator_category; - typedef typename iterator_traits<_Iterator>::value_type value_type; - typedef typename iterator_traits<_Iterator>::difference_type difference_type; typedef typename iterator_traits<_Iterator>::reference reference; -- 2.47.2