From: Paolo Carlini <pcarlini@suse.de>
Date: Thu, 29 Jan 2004 01:27:02 +0000 (+0000)
Subject: revert: re PR libstdc++/10783 (std::vector::reverse_iterator  could be smaller)
X-Git-Tag: releases/gcc-3.3.3~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ebf3e359209b78302ae32a458e7aad98304962a;p=thirdparty%2Fgcc.git

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 3f53b6b44e9e..d0070564becd 100644
--- 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 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<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;