aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2017-11-16 14:39:41 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2017-11-16 14:39:41 +0000
commita930324dabd41a76ef141a85a7d0cc7fc9c9c0b3 (patch)
treead174929ebcf1f2b4c8dc62278644e29b5ab8e6a /libstdc++-v3
parent6748a40f131f846d40e7c93a1a3211bd81d17812 (diff)
downloadgcc-a930324dabd41a76ef141a85a7d0cc7fc9c9c0b3.zip
gcc-a930324dabd41a76ef141a85a7d0cc7fc9c9c0b3.tar.gz
gcc-a930324dabd41a76ef141a85a7d0cc7fc9c9c0b3.tar.bz2
Add noexcept to std::shared_future copy operations (LWG DR 2799)
* include/std/future (shared_future): Add noexcept to copy constructor and copy-assignment operator (LWG 2799). From-SVN: r254821
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/future4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 99bfbba..4be7614 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-16 Jonathan Wakely <jwakely@redhat.com>
+
+ * include/std/future (shared_future): Add noexcept to copy constructor
+ and copy-assignment operator (LWG 2799).
+
2017-11-15 Jason Merrill <jason@redhat.com>
* include/std/numeric (gcd): Fix typo.
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index 73d5a60..d9d446b 100644
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -896,7 +896,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr shared_future() noexcept : _Base_type() { }
/// Copy constructor
- shared_future(const shared_future& __sf) : _Base_type(__sf) { }
+ shared_future(const shared_future& __sf) noexcept : _Base_type(__sf) { }
/// Construct from a future rvalue
shared_future(future<_Res>&& __uf) noexcept
@@ -908,7 +908,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: _Base_type(std::move(__sf))
{ }
- shared_future& operator=(const shared_future& __sf)
+ shared_future& operator=(const shared_future& __sf) noexcept
{
shared_future(__sf)._M_swap(*this);
return *this;