diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2005-10-02 10:20:16 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2005-10-02 10:20:16 +0000 |
| commit | e7dbb3ee6bced9f888758c62aad6d4ab9c04db36 (patch) | |
| tree | 549088803bbd5165bcd66b3c90f7d13373684086 | |
| parent | 746077ffa54f6b711bd93aba1653519c12d5fbcf (diff) | |
| download | gcc-e7dbb3ee6bced9f888758c62aad6d4ab9c04db36.zip gcc-e7dbb3ee6bced9f888758c62aad6d4ab9c04db36.tar.gz gcc-e7dbb3ee6bced9f888758c62aad6d4ab9c04db36.tar.bz2 | |
re PR libstdc++/24054 (std::tr1::unordered_map's erase does not seem to return a value)
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.
From-SVN: r104867
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/hashtable | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/24054.cc | 53 |
3 files changed, 64 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 53d8361..789c85c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +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. + 2005-10-01 Kenny Simpson <theonetruekenny@yahoo.com> * include/tr1/tuple_iterate.h (tuple::operator=(const std::pair<>&)): diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable index 6197094..f5f1e29 100644 --- a/libstdc++-v3/include/tr1/hashtable +++ b/libstdc++-v3/include/tr1/hashtable @@ -1628,6 +1628,7 @@ namespace tr1 { 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 @@ namespace tr1 *slot = n->m_next; m_deallocate_node (n); --m_element_count; + ++result; } + + return result; } // ??? This could be optimized by taking advantage of the bucket diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/24054.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/24054.cc new file mode 100644 index 0000000..073d240 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/hashtable/24054.cc @@ -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; +} |