This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] libstdc++/24054
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Sun, 02 Oct 2005 12:21:59 +0200
- Subject: [v3] libstdc++/24054
Hi,
another very simple bug. Will fix in 4_0-branch too.
Tested x86-linux.
Paolo.
///////////////
2005-10-02 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/24054
* include/tr1/hashtable (erase(const key_type&)): Return the
number of elements erased.
* testsuite/tr1/6_containers/unordered/hashtable/24054.cc: New.
Index: include/tr1/hashtable
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/tr1/hashtable,v
retrieving revision 1.10
diff -u -r1.10 hashtable
--- include/tr1/hashtable 30 Sep 2005 16:54:53 -0000 1.10
+++ include/tr1/hashtable 2 Oct 2005 09:56:54 -0000
@@ -1628,6 +1628,7 @@
{
typename hashtable::hash_code_t code = this->m_hash_code (k);
size_type n = this->bucket_index(k, code, m_bucket_count);
+ size_type result = 0;
node** slot = m_buckets + n;
while (*slot && ! this->compare (k, code, *slot))
@@ -1639,7 +1640,10 @@
*slot = n->m_next;
m_deallocate_node (n);
--m_element_count;
+ ++result;
}
+
+ return result;
}
// ??? This could be optimized by taking advantage of the bucket
Index: testsuite/tr1/6_containers/unordered/hashtable/24054.cc
===================================================================
RCS file: testsuite/tr1/6_containers/unordered/hashtable/24054.cc
diff -N testsuite/tr1/6_containers/unordered/hashtable/24054.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/tr1/6_containers/unordered/hashtable/24054.cc 2 Oct 2005 09:57:00 -0000
@@ -0,0 +1,53 @@
+// 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 <string>
+#include <testsuite_hooks.h>
+
+// libstdc++/24054
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+
+ typedef std::tr1::unordered_multiset<std::string> Set;
+
+ Set s;
+
+ s.insert("etaoin");
+ s.insert("etaoin");
+ s.insert("etaoin");
+ s.insert("shrdlu");
+
+ VERIFY( s.erase("") == 0 );
+ VERIFY( s.size() == 4 );
+
+ VERIFY( s.erase("etaoin") == 3 );
+ VERIFY( s.size() == 1 );
+
+ VERIFY( s.erase("shrdlu") == 1 );
+ VERIFY( s.size() == 0 );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}