diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-09 01:56:42 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-09 01:56:42 +0000 |
| commit | 22364bde8558390587e708606e976800e6e7430e (patch) | |
| tree | 7b4ab3323cd7e2deb3c657e1214ad0e38e3149fe /libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc | |
| parent | e91a9c3f45deac186f0b137b2679eb0efd8add86 (diff) | |
| download | gcc-22364bde8558390587e708606e976800e6e7430e.tar.gz | |
2010-03-08 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
2010-02-11 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/41975, DR 579
* include/bits/hashtable.h (_Hashtable<>::_M_erase_node): Remove.
(erase(const_iterator), erase(const_iterator, const_iterator)):
Change return type to void.
* include/debug/unordered_map: Adjust.
* include/debug/unordered_set: Likewise.
* testsuite/util/exception/safety.h: Likewise.
* testsuite/23_containers/unordered_map/erase/1.cc: Likewise.
* testsuite/23_containers/unordered_map/erase/24061-map.cc: Likewise.
* testsuite/23_containers/unordered_set/erase/1.cc: Likewise.
* testsuite/23_containers/unordered_set/erase/24061-map.cc: Likewise.
* testsuite/23_containers/unordered_multimap/erase/1.cc: Likewise.
* testsuite/23_containers/unordered_multimap/erase/24061-map.cc:
Likewise.
* testsuite/23_containers/unordered_multiset/erase/1.cc: Likewise.
* testsuite/23_containers/unordered_multiset/erase/24061-map.cc:
Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157300 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc')
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc index 70fb41e68e7..f9b74e08c8d 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erase/1.cc @@ -113,7 +113,7 @@ void test01() VERIFY( m1.size() == 2 ); VERIFY( ++it10 == m1.end() ); - m1.erase(m1.begin()); + VERIFY( m1.erase(m1.begin()) != m1.end() ); VERIFY( m1.size() == 1 ); VERIFY( m1.begin() == it11 ); |