stl_vector.h (vector<>): Don't use a name with different meanings before and after...

2002-09-10  Gabriel Dos Reis  <gdr@soliton.integrable-solutions.net>

	* include/bits/stl_vector.h (vector<>): Don't use a name with
	different meanings before and after re-evaluation in the completed
	scope.
	* include/bits/basic_string.h (basic_string<>): Likewise.
	* include/bits/stl_bvector.h (vector<bool>): Likewise.
	* include/bits/stl_deque.h (std): Likewise.
	* include/bits/stl_list.h (list<>): Likewise.
	* include/bits/stl_tree.h (_Rb_tree<>): Likewise.

From-SVN: r57014

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ef14d43bab0f463acda9122707251eafb1505bdb..719d21bbf27a63c93033567b664ff5f3093f445a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-10  Gabriel Dos Reis  <gdr@soliton.integrable-solutions.net>
+
+       * include/bits/stl_vector.h (vector<>): Don't use a name with
+       different meanings before and after re-evaluation in the completed
+       scope. 
+       * include/bits/basic_string.h (basic_string<>): Likewise.
+       * include/bits/stl_bvector.h (vector<bool>): Likewise.
+       * include/bits/stl_deque.h (std): Likewise.
+       * include/bits/stl_list.h (list<>): Likewise.
+       * include/bits/stl_tree.h (_Rb_tree<>): Likewise.
+
 2002-09-10  Paolo Carlini  <pcarlini@unitus.it>
 
        * include/bits/codecvt.h (class __codecvt_abstract_base):

diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 8f3a811f906133c7bab1a4d6e66e8eadf59d335b..0f7247f7c9a98441d2b62177ee9e0e16bd37f9e8 100644 (file)
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -122,8 +122,8 @@ namespace std
       typedef __gnu_cxx::__normal_iterator<pointer, basic_string>  iterator;
       typedef __gnu_cxx::__normal_iterator<const_pointer, basic_string>
                                                             const_iterator;
-      typedef reverse_iterator<const_iterator>         const_reverse_iterator;
-      typedef reverse_iterator<iterator>                   reverse_iterator;
+      typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
+      typedef std::reverse_iterator<iterator>              reverse_iterator;
 
     private:
       // _Rep: string representation

diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index 0c78d7e4bde68e088ffd238b2e9e251e1e6d3b23..59e7b7f967cd8573cf71f6079e8550ab42396cf0 100644 (file)
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -356,8 +356,8 @@ template <typename _Alloc>
     typedef _Bit_iterator                iterator;
     typedef _Bit_const_iterator          const_iterator;
   
-    typedef reverse_iterator<const_iterator> const_reverse_iterator;
-    typedef reverse_iterator<iterator> reverse_iterator;
+    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+    typedef std::reverse_iterator<iterator> reverse_iterator;
   
     typedef typename _Bvector_base<_Alloc>::allocator_type allocator_type;
     allocator_type get_allocator() const {

diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h
index 672a4ef0e5a950af4ba30af791c89d6bb5824d21..7dbbbea7e83ac095b752a2b00b2cb14000870502 100644 (file)
--- a/libstdc++-v3/include/bits/stl_deque.h
+++ b/libstdc++-v3/include/bits/stl_deque.h
@@ -647,8 +647,8 @@ namespace std
     typedef const value_type*                  const_pointer;
     typedef typename _Base::iterator           iterator;
     typedef typename _Base::const_iterator     const_iterator;
-    typedef reverse_iterator<const_iterator>   const_reverse_iterator;
-    typedef reverse_iterator<iterator>         reverse_iterator;
+    typedef std::reverse_iterator<const_iterator>   const_reverse_iterator;
+    typedef std::reverse_iterator<iterator>         reverse_iterator;
     typedef value_type&                        reference;
     typedef const value_type&                  const_reference;
     typedef size_t                             size_type;

diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h
index c5ce621b34aec0e00758584c2709dfe6f8594f9b..fcba3598df248420458771ab44343b95e5a73e1f 100644 (file)
--- a/libstdc++-v3/include/bits/stl_list.h
+++ b/libstdc++-v3/include/bits/stl_list.h
@@ -376,8 +376,8 @@ namespace std
     typedef const value_type*                             const_pointer;
     typedef _List_iterator<_Tp,_Tp&,_Tp*>                 iterator;
     typedef _List_iterator<_Tp,const _Tp&,const _Tp*>     const_iterator;
-    typedef reverse_iterator<const_iterator>              const_reverse_iterator;
-    typedef reverse_iterator<iterator>                    reverse_iterator;
+    typedef std::reverse_iterator<const_iterator>     const_reverse_iterator;
+    typedef std::reverse_iterator<iterator>                 reverse_iterator;
     typedef value_type&                                   reference;
     typedef const value_type&                             const_reference;
     typedef size_t                                        size_type;

diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index d2ae142e9265c7be01e9a43b59506547ddd89197..ec218527c0c1a87f5289986261f3a4a9adb6d568 100644 (file)
--- a/libstdc++-v3/include/bits/stl_tree.h
+++ b/libstdc++-v3/include/bits/stl_tree.h
@@ -702,8 +702,8 @@ namespace std
       typedef _Rb_tree_iterator<value_type, const_reference, const_pointer> 
       const_iterator;
 
-      typedef reverse_iterator<const_iterator> const_reverse_iterator;
-      typedef reverse_iterator<iterator> reverse_iterator;
+      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+      typedef std::reverse_iterator<iterator> reverse_iterator;
 
     private:
       iterator 

diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h
index 6958ab493619595939cafb964b098864a9ec8d5b..a885d9f8dcb5cef5723a9d564e13bd526ffdda5d 100644 (file)
--- a/libstdc++-v3/include/bits/stl_vector.h
+++ b/libstdc++-v3/include/bits/stl_vector.h
@@ -195,8 +195,8 @@ namespace std
     typedef __gnu_cxx::__normal_iterator<pointer, vector_type>         iterator;
     typedef __gnu_cxx::__normal_iterator<const_pointer, vector_type>
                                                           const_iterator;
-    typedef reverse_iterator<const_iterator>              const_reverse_iterator;
-    typedef reverse_iterator<iterator>                    reverse_iterator;
+    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
+    typedef std::reverse_iterator<iterator>                reverse_iterator;
     typedef value_type&                                        reference;
     typedef const value_type&                          const_reference;
     typedef size_t                                     size_type;