summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/debug/unordered_map
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2011-09-01 15:45:20 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2011-09-01 15:45:20 +0000
commit6161ed32995dca0e9a355f575dca4d937654cb9a (patch)
tree26b8b049ff56f8a60cd38c3cb3989852259e59b5 /libstdc++-v3/include/debug/unordered_map
parent9e5f2534e37b446d7aa88f5766b89c0121fa6c56 (diff)
downloadppe42-gcc-6161ed32995dca0e9a355f575dca4d937654cb9a.tar.gz
ppe42-gcc-6161ed32995dca0e9a355f575dca4d937654cb9a.zip
2011-09-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::_Hashtable(_Hashtable&&)): Remove noexcept, the move constructor allocates memory; rearrange the code in the body to consistently update __ht._M_rehash_policy before using _M_next_bkt on it. * include/debug/unordered_map: Adjust. * include/debug/unordered_set: Likewise. * include/profile/unordered_map: Likewise. * include/profile/unordered_set: Likewise. * testsuite/23_containers/unordered_map/cons/ noexcept_move_construct.cc: Remove. * testsuite/23_containers/unordered_set/cons/ noexcept_move_construct.cc: Likewise. * testsuite/23_containers/unordered_multimap/cons/ noexcept_move_construct.cc: Likewise. * testsuite/23_containers/unordered_multiset/cons/ noexcept_move_construct.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178423 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug/unordered_map')
-rw-r--r--libstdc++-v3/include/debug/unordered_map4
1 files changed, 0 insertions, 4 deletions
diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map
index 0e300983bda..6eeff6429e4 100644
--- a/libstdc++-v3/include/debug/unordered_map
+++ b/libstdc++-v3/include/debug/unordered_map
@@ -104,8 +104,6 @@ namespace __debug
: _Base(__x) { }
unordered_map(unordered_map&& __x)
- noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
- is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) { }
unordered_map(initializer_list<value_type> __l,
@@ -485,8 +483,6 @@ namespace __debug
: _Base(__x) { }
unordered_multimap(unordered_multimap&& __x)
- noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
- is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) { }
unordered_multimap(initializer_list<value_type> __l,
OpenPOWER on IntegriCloud