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

2004-01-28  Sylvain Pion  <Sylvain.Pion@mpi-sb.mpg.de>

	PR libstdc++/10783
	* include/bits/stl_iterator.h (class __normal_iterator):
	Don't inherit from iterator, add missing typedefs.

From-SVN: r76788

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dd156059bc746e2815de2866f1090b503ec1caa6..b2147fece2562acae8bf55af3591b719a3696e46 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-28  Sylvain Pion  <Sylvain.Pion@mpi-sb.mpg.de>
+
+       PR libstdc++/10783
+       * include/bits/stl_iterator.h (class __normal_iterator):
+       Don't inherit from iterator, add missing typedefs.
+
 2004-01-27  Paolo Carlini  <pcarlini@suse.de>
 
        PR libstdc++/12967

diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index 529ad7741756b32077140f413d8b8c2c7d7908bf..52fe892f8cab05da63ab392e44e029cf9750c6ba 100644 (file)
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -572,16 +572,15 @@ 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;