diff options
| author | pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-22 19:32:34 +0000 |
|---|---|---|
| committer | pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-22 19:32:34 +0000 |
| commit | 5e2cb6d7f3c929fa24fadc6248166b08f5dd9730 (patch) | |
| tree | 628a4e9e31ef93a60a26c2d13442b156bdac4609 | |
| parent | 7b2b97f93fddf377a3ff27efeb4b049e55f3ee29 (diff) | |
| download | gcc-5e2cb6d7f3c929fa24fadc6248166b08f5dd9730.tar.gz | |
2003-12-22 Andrew Pinski <pinskia@physics.uc.edu>
PR libstdc++/13462
* include/bits/stl_multiset.h (__gnu_norm::multiset): Define pointer
as allocator's pointer, likewise for reference, const_pointer, and
const_reference.
* include/bits/stl_set.h (__gnu_norm::set): Likewise.
* include/ext/hash_set (__gnu_ext::hash_set): Likewise.
(__gnu_ext::hash_multiset): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74944 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 10 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_multiset.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_set.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/hash_set | 16 |
4 files changed, 26 insertions, 16 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d8ca538327a..2f240b86576 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2003-12-22 Andrew Pinski <pinskia@physics.uc.edu> + + PR libstdc++/13462 + * include/bits/stl_multiset.h (__gnu_norm::multiset): Define pointer + as allocator's pointer, likewise for reference, const_pointer, and + const_reference. + * include/bits/stl_set.h (__gnu_norm::set): Likewise. + * include/ext/hash_set (__gnu_ext::hash_set): Likewise. + (__gnu_ext::hash_multiset): Likewise. + 2003-12-22 Paolo Carlini <pcarlini@suse.de> * include/bits/locale_facets.tcc (num_get::_M_extract_int, diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index d85c910a4e0..515ef5c040e 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -100,10 +100,10 @@ private: _Identity<value_type>, key_compare, _Alloc> _Rep_type; _Rep_type _M_t; // red-black tree representing multiset public: - typedef typename _Rep_type::const_pointer pointer; - typedef typename _Rep_type::const_pointer const_pointer; - typedef typename _Rep_type::const_reference reference; - typedef typename _Rep_type::const_reference const_reference; + typedef typename _Alloc::pointer pointer; + typedef typename _Alloc::const_pointer const_pointer; + typedef typename _Alloc::reference reference; + typedef typename _Alloc::const_reference const_reference; typedef typename _Rep_type::const_iterator iterator; typedef typename _Rep_type::const_iterator const_iterator; typedef typename _Rep_type::const_reverse_iterator reverse_iterator; diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index d1494b9db03..285d5ee2a85 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -98,10 +98,10 @@ private: _Identity<value_type>, key_compare, _Alloc> _Rep_type; _Rep_type _M_t; // red-black tree representing set public: - typedef typename _Rep_type::const_pointer pointer; - typedef typename _Rep_type::const_pointer const_pointer; - typedef typename _Rep_type::const_reference reference; - typedef typename _Rep_type::const_reference const_reference; + typedef typename _Alloc::pointer pointer; + typedef typename _Alloc::const_pointer const_pointer; + typedef typename _Alloc::reference reference; + typedef typename _Alloc::const_reference const_reference; typedef typename _Rep_type::const_iterator iterator; typedef typename _Rep_type::const_iterator const_iterator; typedef typename _Rep_type::const_reverse_iterator reverse_iterator; diff --git a/libstdc++-v3/include/ext/hash_set b/libstdc++-v3/include/ext/hash_set index 3151ee626f4..3415ff1ed50 100644 --- a/libstdc++-v3/include/ext/hash_set +++ b/libstdc++-v3/include/ext/hash_set @@ -110,10 +110,10 @@ public: typedef typename _Ht::size_type size_type; typedef typename _Ht::difference_type difference_type; - typedef typename _Ht::const_pointer pointer; - typedef typename _Ht::const_pointer const_pointer; - typedef typename _Ht::const_reference reference; - typedef typename _Ht::const_reference const_reference; + typedef typename _Alloc::pointer pointer; + typedef typename _Alloc::const_pointer const_pointer; + typedef typename _Alloc::reference reference; + typedef typename _Alloc::const_reference const_reference; typedef typename _Ht::const_iterator iterator; typedef typename _Ht::const_iterator const_iterator; @@ -266,10 +266,10 @@ public: typedef typename _Ht::size_type size_type; typedef typename _Ht::difference_type difference_type; - typedef typename _Ht::const_pointer pointer; - typedef typename _Ht::const_pointer const_pointer; - typedef typename _Ht::const_reference reference; - typedef typename _Ht::const_reference const_reference; + typedef typename _Alloc::pointer pointer; + typedef typename _Alloc:const_pointer const_pointer; + typedef typename _Alloc::reference reference; + typedef typename _Alloc::const_reference const_reference; typedef typename _Ht::const_iterator iterator; typedef typename _Ht::const_iterator const_iterator; |