[multiple changes]

2005-08-29  Paolo Carlini  <pcarlini@suse.de>

        Port from HEAD/4_0-branch:
	2004-07-28  Matt Austern  <austern@apple.com>
	* include/ext/hashtable.h: Use rebind so that allocator_type
	has correct type for a container's allocator.

	* testsuite/ext/23528.cc: New.

From-SVN: r103616

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6ac703c3d38b1d0506d0fde988325c20a8f04956..b895aaa389edeea56fb7ac0a97862726fbc2d1e7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-29  Paolo Carlini  <pcarlini@suse.de>
+
+        Port from HEAD/4_0-branch:
+       2004-07-28  Matt Austern  <austern@apple.com>
+       * include/ext/hashtable.h: Use rebind so that allocator_type
+       has correct type for a container's allocator.
+
+       * testsuite/ext/23528.cc: New.
+
 2005-08-24  Lawrence Lim  <llim@redhat.com>
             Jakub Jelinek  <jakub@redhat.com>
            Benjamin Kosnik  <bkoz@redhat.com>

diff --git a/libstdc++-v3/include/ext/hashtable.h b/libstdc++-v3/include/ext/hashtable.h
index f81a8580b15ab8fd0bb086e433f43adb41bd2bff..9f2fb1ef151d3ecdd658da0dcc65a46151597808 100644 (file)
--- a/libstdc++-v3/include/ext/hashtable.h
+++ b/libstdc++-v3/include/ext/hashtable.h
@@ -1,6 +1,6 @@
 // Hashtable implementation used by containers -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 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
@@ -241,7 +241,7 @@ private:
   typedef _Hashtable_node<_Val> _Node;
 
 public:
-  typedef _Alloc allocator_type;
+  typedef typename _Alloc::template rebind<value_type>::other allocator_type;
   allocator_type get_allocator() const { return _M_node_allocator; }
 private:
   typedef typename _Alloc::template rebind<_Node>::other _Node_Alloc;

diff --git a/libstdc++-v3/testsuite/ext/23528.cc b/libstdc++-v3/testsuite/ext/23528.cc
new file mode 100644 (file)
index 0000000..e651e5b
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/23528.cc
@@ -0,0 +1,43 @@
+// Copyright (C) 2005 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// { dg-do compile }
+
+#include <ext/hash_map>
+
+// libstdc++/23528
+void test01()
+{
+  __gnu_cxx::hash_map<int, int> m;
+  m[888] = 999;
+
+  __gnu_cxx::hash_map<int, int>::allocator_type a = m.get_allocator();
+
+  __gnu_cxx::hash_map<int, int>::value_type *y = a.allocate(1);
+
+  a.construct(y, *m.begin());
+
+  a.destroy(y);
+  a.deallocate(y, 1);
+}
+
+int main()
+{
+  test01();
+  return 0;
+}