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

	    Chris Jefferson  <chris@bubblescope.net>

	PR libstdc++/23465
	* include/tr1/hashtable (hash_code_base::m_swap): Use
	std::swap.
	(hashtable<>::hashtable(const hashtable&)): Use copy_code;
	fix m_allocate_node call.
	* testsuite/tr1/6_containers/unordered/hashtable/23465.cc: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@103441 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 621179a..8ce2abb 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-24  Paolo Carlini  <pcarlini@suse.de>
+           Chris Jefferson  <chris@bubblescope.net>
+
+       PR libstdc++/23465
+       * include/tr1/hashtable (hash_code_base::m_swap): Use
+       std::swap.
+       (hashtable<>::hashtable(const hashtable&)): Use copy_code;
+       fix m_allocate_node call.
+       * testsuite/tr1/6_containers/unordered/hashtable/23465.cc: New.
+
 2005-08-23  Kelley Cook  <kcook@gcc.gnu.org>
 
        PR libstdc++/23462

diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable
index 824f4df..4245e97 100644 (file)
--- a/libstdc++-v3/include/tr1/hashtable
+++ b/libstdc++-v3/include/tr1/hashtable
@@ -631,9 +631,9 @@ namespace Internal
       void
       m_swap(hash_code_base& x)
       {
-       m_extract.m_swap(x);
-       m_eq.m_swap(x);
-       m_ranged_hash.m_swap(x);
+       std::swap(m_extract, x.m_extract);
+       std::swap(m_eq, x.m_eq);
+       std::swap(m_ranged_hash, x.m_ranged_hash);
       }
 
     protected:
@@ -703,10 +703,10 @@ namespace Internal
       void
       m_swap(hash_code_base& x)
       {
-       m_extract.m_swap(x);
-       m_eq.m_swap(x);
-       m_h1.m_swap(x);
-       m_h2.m_swap(x);
+       std::swap(m_extract, x.m_extract);
+       std::swap(m_eq, x.m_eq);
+       std::swap(m_h1, x.m_h1);
+       std::swap(m_h2, x.m_h2);
       }
 
     protected:
@@ -762,10 +762,10 @@ namespace Internal
       void
       m_swap(hash_code_base& x)
       {
-       m_extract.m_swap(x);
-       m_eq.m_swap(x);
-       m_h1.m_swap(x);
-       m_h2.m_swap(x);
+       std::swap(m_extract, x.m_extract);
+       std::swap(m_eq, x.m_eq);
+       std::swap(m_h1, x.m_h1);
+       std::swap(m_h2, x.m_h2);
       }
       
     protected:
@@ -1271,8 +1271,8 @@ namespace tr1
              node** tail = m_buckets + i;
              while (n)
                {
-                 *tail = m_allocate_node(n);
-                 (*tail).copy_code_from(n);
+                 *tail = m_allocate_node(n->m_v);
+                 this->copy_code(*tail, n);
                  tail = &((*tail)->m_next);
                  n = n->m_next;
                }

diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/23465.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/23465.cc
new file mode 100644 (file)
index 0000000..56c3ab5
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/23465.cc
@@ -0,0 +1,64 @@
+// 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.
+
+// 6.3 Unordered associative containers
+
+#include <tr1/unordered_set>
+#include <testsuite_hooks.h>
+
+// libstdc++/23465
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  for (float lf = 0.1; lf < 1001.0; lf *= 10.0)
+    for (int size = 1; size <= 19683; size *= 3)
+      {
+       std::tr1::unordered_set<int> us1, us2;
+       typedef std::tr1::unordered_set<int>::local_iterator local_iterator;
+       typedef std::tr1::unordered_set<int>::size_type      size_type;
+       
+       us1.max_load_factor(lf);
+
+       for (int i = 0; i < size; ++i)
+         us1.insert(i);
+       
+       us2 = us1;
+       
+       VERIFY( us2.size() == us1.size() );
+       VERIFY( us2.bucket_count() == us1.bucket_count() );
+       
+       for (size_type b = 0; b < us1.bucket_count(); ++b)
+         {
+           size_type cnt = 0;
+           for (local_iterator it1 = us1.begin(b), it2 = us2.begin(b);
+                it1 != us1.end(b) && it2 != us2.end(b); ++it1, ++it2)
+             {
+               VERIFY( *it1 == *it2 );
+               ++cnt;
+             }
+           VERIFY( cnt == us1.bucket_size(b) );
+         }
+      }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}