From d723ced225a7a6e0130799c4bc2ce4daadfe358d Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 9 Mar 2010 01:56:42 +0000 Subject: revert: PR libstdc++/41975, DR 579 2010-03-08 Paolo Carlini Revert: 2010-02-11 Paolo Carlini 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. From-SVN: r157300 --- libstdc++-v3/testsuite/util/exception/safety.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'libstdc++-v3/testsuite/util/exception') diff --git a/libstdc++-v3/testsuite/util/exception/safety.h b/libstdc++-v3/testsuite/util/exception/safety.h index a17b755..aef58b6 100644 --- a/libstdc++-v3/testsuite/util/exception/safety.h +++ b/libstdc++-v3/testsuite/util/exception/safety.h @@ -285,9 +285,9 @@ namespace __gnu_test typedef typename container_type::iterator iterator; typedef typename container_type::const_iterator const_iterator; - void (container_type::* _F_erase_point)(const_iterator); - void (container_type::* _F_erase_range)(const_iterator, - const_iterator); + iterator (container_type::* _F_erase_point)(const_iterator); + iterator (container_type::* _F_erase_range)(const_iterator, + const_iterator); erase_base() : _F_erase_point(&container_type::erase), @@ -304,9 +304,9 @@ namespace __gnu_test typedef typename container_type::iterator iterator; typedef typename container_type::const_iterator const_iterator; - void (container_type::* _F_erase_point)(const_iterator); - void (container_type::* _F_erase_range)(const_iterator, - const_iterator); + iterator (container_type::* _F_erase_point)(const_iterator); + iterator (container_type::* _F_erase_range)(const_iterator, + const_iterator); erase_base() : _F_erase_point(&container_type::erase), @@ -321,9 +321,9 @@ namespace __gnu_test typedef typename container_type::iterator iterator; typedef typename container_type::const_iterator const_iterator; - void (container_type::* _F_erase_point)(const_iterator); - void (container_type::* _F_erase_range)(const_iterator, - const_iterator); + iterator (container_type::* _F_erase_point)(const_iterator); + iterator (container_type::* _F_erase_range)(const_iterator, + const_iterator); erase_base() : _F_erase_point(&container_type::erase), @@ -338,9 +338,9 @@ namespace __gnu_test typedef typename container_type::iterator iterator; typedef typename container_type::const_iterator const_iterator; - void (container_type::* _F_erase_point)(const_iterator); - void (container_type::* _F_erase_range)(const_iterator, - const_iterator); + iterator (container_type::* _F_erase_point)(const_iterator); + iterator (container_type::* _F_erase_range)(const_iterator, + const_iterator); erase_base() : _F_erase_point(&container_type::erase), -- cgit v1.1