[v3] Remove noexcept mistakenly added to the unordered_* move cons

Message ID	4E5FA9F4.50402@oracle.com
State	New
Headers	show Return-Path: <gcc-patches-return-301175-incoming=patchwork.ozlabs.org@gcc.gnu.org> Message-ID: <4E5FA9F4.50402@oracle.com> Date: Thu, 01 Sep 2011 17:51:16 +0200 From: Paolo Carlini <paolo.carlini@oracle.com> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20110812 Thunderbird/6.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org> CC: libstdc++ <libstdc++@gcc.gnu.org> Subject: [v3] Remove noexcept mistakenly added to the unordered_* move cons Content-Type: multipart/mixed; boundary="------------000406090101020700050800" Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

Index: include/debug/unordered_map =================================================================== --- include/debug/unordered_map (revision 178397) +++ include/debug/unordered_map (working copy) @@ -104,8 +104,6 @@ : _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 @@ : _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, Index: include/debug/unordered_set =================================================================== --- include/debug/unordered_set (revision 178397) +++ include/debug/unordered_set (working copy) @@ -104,8 +104,6 @@ : _Base(__x) { } unordered_set(unordered_set&& __x) - noexcept(__and_<is_nothrow_copy_constructible<_Hash>, - is_nothrow_copy_constructible<_Pred>>::value) : _Base(std::move(__x)) { } unordered_set(initializer_list<value_type> __l, @@ -480,8 +478,6 @@ : _Base(__x) { } unordered_multiset(unordered_multiset&& __x) - noexcept(__and_<is_nothrow_copy_constructible<_Hash>, - is_nothrow_copy_constructible<_Pred>>::value) : _Base(std::move(__x)) { } unordered_multiset(initializer_list<value_type> __l, Index: include/profile/unordered_map =================================================================== --- include/profile/unordered_map (revision 178397) +++ include/profile/unordered_map (working copy) @@ -104,8 +104,6 @@ } unordered_map(unordered_map&& __x) - noexcept(__and_<is_nothrow_copy_constructible<_Hash>, - is_nothrow_copy_constructible<_Pred>>::value) : _Base(std::move(__x)) { __profcxx_hashtable_construct(this, _Base::bucket_count()); @@ -374,8 +372,6 @@ } unordered_multimap(unordered_multimap&& __x) - noexcept(__and_<is_nothrow_copy_constructible<_Hash>, - is_nothrow_copy_constructible<_Pred>>::value) : _Base(std::move(__x)) { __profcxx_hashtable_construct(this, _Base::bucket_count()); Index: include/profile/unordered_set =================================================================== --- include/profile/unordered_set (revision 178397) +++ include/profile/unordered_set (working copy) @@ -103,8 +103,6 @@ } unordered_set(unordered_set&& __x) - noexcept(__and_<is_nothrow_copy_constructible<_Hash>, - is_nothrow_copy_constructible<_Pred>>::value) : _Base(std::move(__x)) { __profcxx_hashtable_construct(this, _Base::bucket_count()); @@ -348,8 +346,6 @@ } unordered_multiset(unordered_multiset&& __x) - noexcept(__and_<is_nothrow_copy_constructible<_Hash>, - is_nothrow_copy_constructible<_Pred>>::value) : _Base(std::move(__x)) { __profcxx_hashtable_construct(this, _Base::bucket_count()); Index: include/bits/hashtable.h =================================================================== --- include/bits/hashtable.h (revision 178397) +++ include/bits/hashtable.h (working copy) @@ -674,8 +674,6 @@ _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal, _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>:: _Hashtable(_Hashtable&& __ht) - noexcept(__and_<is_nothrow_copy_constructible<_Equal>, - is_nothrow_copy_constructible<_H1>>::value) : __detail::_Rehash_base<_RehashPolicy, _Hashtable>(__ht), __detail::_Hash_code_base<_Key, _Value, _ExtractKey, _Equal, _H1, _H2, _Hash, __chc>(__ht), @@ -687,12 +685,11 @@ _M_element_count(__ht._M_element_count), _M_rehash_policy(__ht._M_rehash_policy) { - size_type __n_bkt = __ht._M_rehash_policy._M_next_bkt(0); - __ht._M_buckets = __ht._M_allocate_buckets(__n_bkt); - __ht._M_bucket_count = __n_bkt; + __ht._M_rehash_policy = _RehashPolicy(); + __ht._M_bucket_count = __ht._M_rehash_policy._M_next_bkt(0); + __ht._M_buckets = __ht._M_allocate_buckets(__ht._M_bucket_count); __ht._M_begin_bucket_index = __ht._M_bucket_count; __ht._M_element_count = 0; - __ht._M_rehash_policy = _RehashPolicy(); } template<typename _Key, typename _Value, Index: testsuite/23_containers/unordered_map/cons/noexcept_move_construct.cc =================================================================== --- testsuite/23_containers/unordered_map/cons/noexcept_move_construct.cc (revision 178397) +++ testsuite/23_containers/unordered_map/cons/noexcept_move_construct.cc (working copy) @@ -1,27 +0,0 @@ -// { dg-do compile } -// { dg-options "-std=gnu++0x" } - -// 2011-06-01 Paolo Carlini <paolo.carlini@oracle.com> -// -// Copyright (C) 2011 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 3, 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 COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <unordered_map> - -typedef std::unordered_map<int, int> umtype; - -static_assert(std::is_nothrow_move_constructible<umtype>::value, "Error"); Index: testsuite/23_containers/unordered_multimap/cons/noexcept_move_construct.cc =================================================================== --- testsuite/23_containers/unordered_multimap/cons/noexcept_move_construct.cc (revision 178397) +++ testsuite/23_containers/unordered_multimap/cons/noexcept_move_construct.cc (working copy) @@ -1,27 +0,0 @@ -// { dg-do compile } -// { dg-options "-std=gnu++0x" } - -// 2011-06-01 Paolo Carlini <paolo.carlini@oracle.com> -// -// Copyright (C) 2011 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 3, 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 COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <unordered_map> - -typedef std::unordered_multimap<int, int> ummtype; - -static_assert(std::is_nothrow_move_constructible<ummtype>::value, "Error"); Index: testsuite/23_containers/unordered_set/cons/noexcept_move_construct.cc =================================================================== --- testsuite/23_containers/unordered_set/cons/noexcept_move_construct.cc (revision 178397) +++ testsuite/23_containers/unordered_set/cons/noexcept_move_construct.cc (working copy) @@ -1,27 +0,0 @@ -// { dg-do compile } -// { dg-options "-std=gnu++0x" } - -// 2011-06-01 Paolo Carlini <paolo.carlini@oracle.com> -// -// Copyright (C) 2011 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 3, 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 COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <unordered_set> - -typedef std::unordered_set<int> ustype; - -static_assert(std::is_nothrow_move_constructible<ustype>::value, "Error"); Index: testsuite/23_containers/unordered_multiset/cons/noexcept_move_construct.cc =================================================================== --- testsuite/23_containers/unordered_multiset/cons/noexcept_move_construct.cc (revision 178397) +++ testsuite/23_containers/unordered_multiset/cons/noexcept_move_construct.cc (working copy) @@ -1,27 +0,0 @@ -// { dg-do compile } -// { dg-options "-std=gnu++0x" } - -// 2011-06-01 Paolo Carlini <paolo.carlini@oracle.com> -// -// Copyright (C) 2011 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 3, 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 COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <unordered_set> - -typedef std::unordered_multiset<int> umstype; - -static_assert(std::is_nothrow_move_constructible<umstype>::value, "Error");

[v3] Remove noexcept mistakenly added to the unordered_* move cons

Commit Message

Patch