diff options
author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-08-22 16:47:34 +0000 |
---|---|---|
committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-08-22 16:47:34 +0000 |
commit | 226f37b67484c8d370e229d993f5306c3b05954e (patch) | |
tree | 45f20929df2facdcffcabdbc366b27245b246fff | |
parent | 25678084dc30397f7ba88623446245e23bea6cd6 (diff) | |
download | gcc-226f37b67484c8d370e229d993f5306c3b05954e.tar.gz |
Add noexcept to std::function swap
PR libstdc++/77322
* doc/xml/manual/intro.xml: Document DR 2062 change.
* include/std/functional (function::swap): Add noexcept.
(swap(function<Res(Args...)&, function<Res(Args...)&)): Likewise.
* testsuite/20_util/function/77322.cc: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239662 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
-rw-r--r-- | libstdc++-v3/doc/xml/manual/intro.xml | 6 | ||||
-rw-r--r-- | libstdc++-v3/include/std/functional | 6 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/function/77322.cc | 25 |
4 files changed, 43 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c5e78699f24..91dbc9d56fd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2016-08-22 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/77322 + * doc/xml/manual/intro.xml: Document DR 2062 change. + * include/std/functional (function::swap): Add noexcept. + (swap(function<Res(Args...)&, function<Res(Args...)&)): Likewise. + * testsuite/20_util/function/77322.cc: New test. + 2016-08-19 Jonathan Wakely <jwakely@redhat.com> * testsuite/21_strings/basic_string/pthread18185.cc: Use -pthread for diff --git a/libstdc++-v3/doc/xml/manual/intro.xml b/libstdc++-v3/doc/xml/manual/intro.xml index a5e0a3bed01..ea4d1c52096 100644 --- a/libstdc++-v3/doc/xml/manual/intro.xml +++ b/libstdc++-v3/doc/xml/manual/intro.xml @@ -850,6 +850,12 @@ requirements of the license of GCC. <listitem><para>Add additional overloads. </para></listitem></varlistentry> + <varlistentry><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../ext/lwg-defects.html#2062">2062</link>: + <emphasis>2062. Effect contradictions w/o no-throw guarantee of <code>std::function</code> swaps</emphasis> + </term> + <listitem><para>Add <code>noexcept</code> to swap functions. + </para></listitem></varlistentry> + <varlistentry><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../ext/lwg-defects.html#2063">2063</link>: <emphasis>Contradictory requirements for string move assignment</emphasis> </term> diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 87d1c17d166..05d4282c8bd 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1922,7 +1922,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type) * Swap the targets of @c this function object and @a __f. This * function will not throw an %exception. */ - void swap(function& __x) + void swap(function& __x) noexcept { std::swap(_M_functor, __x._M_functor); std::swap(_M_manager, __x._M_manager); @@ -2124,9 +2124,11 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type) * * This function will not throw an %exception. */ + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2062. Effect contradictions w/o no-throw guarantee of std::function swaps template<typename _Res, typename... _Args> inline void - swap(function<_Res(_Args...)>& __x, function<_Res(_Args...)>& __y) + swap(function<_Res(_Args...)>& __x, function<_Res(_Args...)>& __y) noexcept { __x.swap(__y); } diff --git a/libstdc++-v3/testsuite/20_util/function/77322.cc b/libstdc++-v3/testsuite/20_util/function/77322.cc new file mode 100644 index 00000000000..67813d4e050 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function/77322.cc @@ -0,0 +1,25 @@ +// 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 <functional> + +// PR libstdc++/77322 +std::function<void()> f, g; +static_assert( noexcept(f.swap(g)), "member swap is noexcept" ); +static_assert( noexcept(swap(f, g)), "non-member swap is noexcept" ); |