re PR libstdc++/13462 (Non-standard conformed type set::pointer)

2004-01-28  Andrew Pinski  <pinskia@physics.uc.edu>

	PR libstdc++/13462
	* include/bits/stl_multiset.h (std::multiset): Define pointer
	as allocator's pointer, likewise for reference, const_pointer, and
	const_reference.
	* include/bits/stl_set.h (std::set): Likewise.
	* include/ext/hash_set (__gnu_cxx::hash_set): Likewise.
	(__gnu_cxx::hash_multiset): Likewise.

From-SVN: r76793

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b2147fece2562acae8bf55af3591b719a3696e46..3f53b6b44e9ef9ad4d596df4c482947bf2c477f0 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-28  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR libstdc++/13462
+       * include/bits/stl_multiset.h (std::multiset): Define pointer
+       as allocator's pointer, likewise for reference, const_pointer, and
+       const_reference.
+       * include/bits/stl_set.h (std::set): Likewise.
+       * include/ext/hash_set (__gnu_cxx::hash_set): Likewise.
+       (__gnu_cxx::hash_multiset): Likewise.
+
 2004-01-28  Sylvain Pion  <Sylvain.Pion@mpi-sb.mpg.de>
 
        PR libstdc++/10783

diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h
index 2bfc8f10c32b47c1cb82896336af5b67b90f6221..bc5b8471980e71499e4af4c9e9f2c4c09530decb 100644 (file)
--- 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 ee708c292179a07fd884cf340a01a4f689cf8a3c..3a49e4d15739d70755cabbd8adee6ff581460b27 100644 (file)
--- a/libstdc++-v3/include/bits/stl_set.h
+++ b/libstdc++-v3/include/bits/stl_set.h
@@ -99,10 +99,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 0f420e2dd7ebc27b1faabbdaff008634f9314d22..f05141d7e49a2a6287757a8adbc3311cc40ce032 100644 (file)
--- a/libstdc++-v3/include/ext/hash_set
+++ b/libstdc++-v3/include/ext/hash_set
@@ -111,10 +111,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;
@@ -267,10 +267,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;