revert: re PR libstdc++/10783 (std::vector::reverse_iterator could be smaller)

2004-01-29  Paolo Carlini  <pcarlini@suse.de>

	* Reverting Sylvain Pion's patch to libstdc++/10783, backported
	from mainline: probably not safe for the ABI.

From-SVN: r76824

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3f53b6b44e9ef9ad4d596df4c482947bf2c477f0..d0070564becd8c862419974ba9a2361f6de1e262 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-29  Paolo Carlini  <pcarlini@suse.de>
+
+       * Reverting Sylvain Pion's patch to libstdc++/10783, backported
+       from mainline: probably not safe for the ABI.
+
 2004-01-28  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR libstdc++/13462

diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index 52fe892f8cab05da63ab392e44e029cf9750c6ba..529ad7741756b32077140f413d8b8c2c7d7908bf 100644 (file)
--- 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<typename _Iterator, typename _Container>
     class __normal_iterator
+      : public iterator<typename iterator_traits<_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;