77864 Fix noexcept conditions for map/set default constructors

Message ID	20161005115617.GA5501@redhat.com
State	New
Headers	show Return-Path: <gcc-patches-return-437705-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=GJVT41gM4/Zoz2ZkEKMigV2CIgRLuFsJgCqmrP2KL49MYASMkh+1P QIMDQiw3ufVASYgCzLdII6LY/ATCUYcdQoMILIson/TGsPhNT0sBBQkA2HX4Ns1e mntwGz7uBlhcSUuJo0AlGQsCApAaixDp7idJBrm6MrNveHODPpXDxg= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org Date: Wed, 5 Oct 2016 12:56:17 +0100 From: Jonathan Wakely <jwakely@redhat.com> To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] 77864 Fix noexcept conditions for map/set default constructors Message-ID: <20161005115617.GA5501@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="YZ5djTAD1cGYuMQK" Content-Disposition: inline User-Agent: Mutt/1.7.0 (2016-08-17)

diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index 9a0454a..e5b2a1b 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -168,9 +168,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Default constructor creates no elements. */ map() -#if __cplusplus >= 201103L - noexcept(is_nothrow_default_constructible<allocator_type>::value) -#endif + _GLIBCXX_NOEXCEPT_IF( + is_nothrow_default_constructible<allocator_type>::value + && is_nothrow_default_constructible<key_compare>::value) : _M_t() { } /** diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index c794b9b..d240427 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -165,9 +165,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Default constructor creates no elements. */ multimap() -#if __cplusplus >= 201103L - noexcept(is_nothrow_default_constructible<allocator_type>::value) -#endif + _GLIBCXX_NOEXCEPT_IF( + is_nothrow_default_constructible<allocator_type>::value + && is_nothrow_default_constructible<key_compare>::value) : _M_t() { } /** diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index d3219eb..cc068a9 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -145,9 +145,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Default constructor creates no elements. */ multiset() -#if __cplusplus >= 201103L - noexcept(is_nothrow_default_constructible<allocator_type>::value) -#endif + _GLIBCXX_NOEXCEPT_IF( + is_nothrow_default_constructible<allocator_type>::value + && is_nothrow_default_constructible<key_compare>::value) : _M_t() { } /** diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index 140db39..3938351 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -148,9 +148,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Default constructor creates no elements. */ set() -#if __cplusplus >= 201103L - noexcept(is_nothrow_default_constructible<allocator_type>::value) -#endif + _GLIBCXX_NOEXCEPT_IF( + is_nothrow_default_constructible<allocator_type>::value + && is_nothrow_default_constructible<key_compare>::value) : _M_t() { } /** diff --git a/libstdc++-v3/testsuite/23_containers/map/cons/noexcept_default_construct.cc b/libstdc++-v3/testsuite/23_containers/map/cons/noexcept_default_construct.cc new file mode 100644 index 0000000..1286d37 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/map/cons/noexcept_default_construct.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2016 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/>. + +// { dg-do compile { target c++11 } } + +#include <map> + +using mtype1 = std::map<int, int>; +static_assert(std::is_nothrow_default_constructible<mtype1>::value, "Error"); + +struct cmp +{ + cmp() { } + bool operator()(int, int) const; +}; + +using mtype2 = std::map<int, int, cmp>; +static_assert( !std::is_nothrow_default_constructible<mtype2>::value, "Error"); diff --git a/libstdc++-v3/testsuite/23_containers/multimap/cons/noexcept_default_construct.cc b/libstdc++-v3/testsuite/23_containers/multimap/cons/noexcept_default_construct.cc new file mode 100644 index 0000000..30c0656 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/multimap/cons/noexcept_default_construct.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2016 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/>. + +// { dg-do compile { target c++11 } } + +#include <map> + +using mtype1 = std::multimap<int, int>; +static_assert(std::is_nothrow_default_constructible<mtype1>::value, "Error"); + +struct cmp +{ + cmp() { } + bool operator()(int, int) const; +}; + +using mtype2 = std::multimap<int, int, cmp>; +static_assert( !std::is_nothrow_default_constructible<mtype2>::value, "Error"); diff --git a/libstdc++-v3/testsuite/23_containers/multiset/cons/noexcept_default_construct.cc b/libstdc++-v3/testsuite/23_containers/multiset/cons/noexcept_default_construct.cc new file mode 100644 index 0000000..d42fcd5 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/multiset/cons/noexcept_default_construct.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2016 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/>. + +// { dg-do compile { target c++11 } } + +#include <set> + +using stype1 = std::multiset<int>; +static_assert(std::is_nothrow_default_constructible<stype1>::value, "Error"); + +struct cmp +{ + cmp() { } + bool operator()(int, int) const; +}; + +using stype2 = std::multiset<int, cmp>; +static_assert( !std::is_nothrow_default_constructible<stype2>::value, "Error"); diff --git a/libstdc++-v3/testsuite/23_containers/set/cons/noexcept_default_construct.cc b/libstdc++-v3/testsuite/23_containers/set/cons/noexcept_default_construct.cc new file mode 100644 index 0000000..7aba006 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/set/cons/noexcept_default_construct.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2016 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/>. + +// { dg-do compile { target c++11 } } + +#include <set> + +using stype1 = std::set<int>; +static_assert(std::is_nothrow_default_constructible<stype1>::value, "Error"); + +struct cmp +{ + cmp() { } + bool operator()(int, int) const; +}; + +using stype2 = std::set<int, cmp>; +static_assert( !std::is_nothrow_default_constructible<stype2>::value, "Error");

77864 Fix noexcept conditions for map/set default constructors

Commit Message

Comments

Patch