This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] Fix libstdc++/10783


Hi,

tested x86-linux.

Paolo.

////////
2003-05-29  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.

2003-05-29  Paolo Carlini <pcarlini@unitus.it>

	* testsuite/24_iterators/reverse_iterator.cc: Split up, as follows.
	* testsuite/24_iterators/reverse_iterator/1.cc: New.
	* testsuite/24_iterators/reverse_iterator/2.cc: New.
	* testsuite/24_iterators/reverse_iterator/3.cc: New, from
	PR libstdc++/10783.
diff -urN libstdc++-v3-orig/include/bits/stl_iterator.h libstdc++-v3/include/bits/stl_iterator.h
--- libstdc++-v3-orig/include/bits/stl_iterator.h	2002-07-20 08:26:27.000000000 +0200
+++ libstdc++-v3/include/bits/stl_iterator.h	2003-05-23 15:30:09.000000000 +0200
@@ -569,16 +569,14 @@
   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;
diff -urN libstdc++-v3-orig/testsuite/24_iterators/reverse_iterator/1.cc libstdc++-v3/testsuite/24_iterators/reverse_iterator/1.cc
--- libstdc++-v3-orig/testsuite/24_iterators/reverse_iterator/1.cc	1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/24_iterators/reverse_iterator/1.cc	2003-05-23 20:16:58.000000000 +0200
@@ -0,0 +1,56 @@
+// 2001-06-21  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 24.4.1.2 Reverse iterators
+
+#include <iterator>
+
+void test01()
+{
+  using namespace std;
+
+  // Check for required base class.
+  long l;
+  typedef reverse_iterator<long*> test_iterator;
+  typedef iterator<iterator_traits<long*>::iterator_category,
+		   iterator_traits<long*>::value_type,
+		   iterator_traits<long*>::difference_type,
+		   iterator_traits<long*>::pointer,
+                   iterator_traits<long*>::reference>
+    base_iterator;
+  test_iterator  r_it(&l);
+  base_iterator* base = &r_it;
+
+  // Check for required typedefs
+  typedef test_iterator::value_type value_type;
+  typedef test_iterator::difference_type difference_type;
+  typedef test_iterator::pointer pointer;
+  typedef test_iterator::reference reference;
+  typedef test_iterator::iterator_category iteratory_category;
+}
+
+// Make sure iterator can be instantiated.
+template class std::reverse_iterator<int*>;
+
+int main() 
+{ 
+  test01();
+  return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/24_iterators/reverse_iterator/2.cc libstdc++-v3/testsuite/24_iterators/reverse_iterator/2.cc
--- libstdc++-v3-orig/testsuite/24_iterators/reverse_iterator/2.cc	1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/24_iterators/reverse_iterator/2.cc	2003-05-23 20:17:07.000000000 +0200
@@ -0,0 +1,54 @@
+// 2001-06-21  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 24.4.1.2 Reverse iterators
+
+#include <iterator>
+
+void test02()
+{
+  typedef std::reverse_iterator<int*> iterator_type;
+  iterator_type it01;
+  iterator_type it02;
+
+  // Sanity check non-member operators and functions can be instantiated. 
+  it01 == it02;
+  it01 != it02;
+  it01 < it02;
+  it01 <= it02;
+  it01 > it02;
+  it01 >= it02;
+  it01 - it02;
+  5 + it02;
+}
+
+// Check data member 'current' accessible.
+class test_dm : public std::reverse_iterator<int*>
+{
+  int* p;
+public:
+  test_dm(): p(current) { }
+};
+
+int main() 
+{ 
+  test02();
+  return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/24_iterators/reverse_iterator/3.cc libstdc++-v3/testsuite/24_iterators/reverse_iterator/3.cc
--- libstdc++-v3-orig/testsuite/24_iterators/reverse_iterator/3.cc	1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/24_iterators/reverse_iterator/3.cc	2003-05-29 13:06:56.000000000 +0200
@@ -0,0 +1,40 @@
+// 2003-05-29  Paolo Carlini  <pcarlini@unitus.it>
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 24.4.1.2 Reverse iterators
+
+#include <iterator>
+#include <vector>
+#include <testsuite_hooks.h>
+
+// libstdc++/10783
+void test03()
+{
+  bool test = true;
+
+  typedef std::vector<int> V;
+  VERIFY( sizeof(V::iterator) == sizeof(V::reverse_iterator) );
+}
+
+int main() 
+{ 
+  test03();
+  return 0;
+}
diff -urN libstdc++-v3-orig/testsuite/24_iterators/reverse_iterator.cc libstdc++-v3/testsuite/24_iterators/reverse_iterator.cc
--- libstdc++-v3-orig/testsuite/24_iterators/reverse_iterator.cc	2002-01-17 04:59:42.000000000 +0100
+++ libstdc++-v3/testsuite/24_iterators/reverse_iterator.cc	1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
-// 2001-06-21  Benjamin Kosnik  <bkoz@redhat.com>
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// 24.4.1.2 Reverse iterators
-
-#include <iterator>
-
-void test01()
-{
-  using namespace std;
-
-  // Check for required base class.
-  long l;
-  typedef reverse_iterator<long*> test_iterator;
-  typedef iterator<iterator_traits<long*>::iterator_category,
-		   iterator_traits<long*>::value_type,
-		   iterator_traits<long*>::difference_type,
-		   iterator_traits<long*>::pointer,
-                   iterator_traits<long*>::reference>
-    base_iterator;
-  test_iterator  r_it(&l);
-  base_iterator* base = &r_it;
-
-  // Check for required typedefs
-  typedef test_iterator::value_type value_type;
-  typedef test_iterator::difference_type difference_type;
-  typedef test_iterator::pointer pointer;
-  typedef test_iterator::reference reference;
-  typedef test_iterator::iterator_category iteratory_category;
-}
-
-
-// Make sure iterator can be instantiated.
-template class std::reverse_iterator<int*>;
-
-void test02()
-{
-  typedef std::reverse_iterator<int*> iterator_type;
-  iterator_type it01;
-  iterator_type it02;
-
-  // Sanity check non-member operators and functions can be instantiated. 
-  it01 == it02;
-  it01 != it02;
-  it01 < it02;
-  it01 <= it02;
-  it01 > it02;
-  it01 >= it02;
-  it01 - it02;
-  5 + it02;
-}
-
-// Check data member 'current' accessible.
-class test_dm : public std::reverse_iterator<int*>
-{
-  int* p;
-public:
-  test_dm(): p(current) { }
-};
-
-int main() 
-{ 
-  test01();
-  test02();
-  return 0;
-}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]