From be26865df1939eaa0d9eed79ad9e2f713d405baf Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Tue, 10 Sep 2002 23:19:10 +0000 Subject: [PATCH] stl_vector.h (vector<>): Don't use a name with different meanings before and after re-evaluation in the... 2002-09-10 Gabriel Dos Reis * 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): 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 --- libstdc++-v3/ChangeLog | 11 +++++++++++ libstdc++-v3/include/bits/basic_string.h | 4 ++-- libstdc++-v3/include/bits/stl_bvector.h | 4 ++-- libstdc++-v3/include/bits/stl_deque.h | 4 ++-- libstdc++-v3/include/bits/stl_list.h | 4 ++-- libstdc++-v3/include/bits/stl_tree.h | 4 ++-- libstdc++-v3/include/bits/stl_vector.h | 4 ++-- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ef14d43bab0..719d21bbf27 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2002-09-10 Gabriel Dos Reis + + * 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): 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 * 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 8f3a811f906..0f7247f7c9a 100644 --- 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 iterator; typedef __gnu_cxx::__normal_iterator const_iterator; - typedef reverse_iterator const_reverse_iterator; - typedef reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + typedef std::reverse_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 0c78d7e4bde..59e7b7f967c 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -356,8 +356,8 @@ template typedef _Bit_iterator iterator; typedef _Bit_const_iterator const_iterator; - typedef reverse_iterator const_reverse_iterator; - typedef reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + typedef std::reverse_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 672a4ef0e5a..7dbbbea7e83 100644 --- 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_reverse_iterator; - typedef reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + typedef std::reverse_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 c5ce621b34a..fcba3598df2 100644 --- 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_reverse_iterator; - typedef reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + typedef std::reverse_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 d2ae142e926..ec218527c0c 100644 --- 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 const_iterator; - typedef reverse_iterator const_reverse_iterator; - typedef reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + typedef std::reverse_iterator reverse_iterator; private: iterator diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 6958ab49361..a885d9f8dcb 100644 --- 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 iterator; typedef __gnu_cxx::__normal_iterator const_iterator; - typedef reverse_iterator const_reverse_iterator; - typedef reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + typedef std::reverse_iterator reverse_iterator; typedef value_type& reference; typedef const value_type& const_reference; typedef size_t size_type; -- 2.30.2