From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 24 Apr 2017 11:40:02 +0000 (+0100)
Subject: PR libstdc++/80493 fix invalid exception specification
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=71f257f78e8b2568c76f226d665b890902453121;p=gcc.git

PR libstdc++/80493 fix invalid exception specification

	PR libstdc++/80493
	* include/experimental/optional (optional::swap): Fix exception
	specification.

From-SVN: r247093
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bd43faa6c6d..6330a490972 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-24  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/80493
+	* include/experimental/optional (optional::swap): Fix exception
+	specification.
+
 2017-04-21  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/80316
diff --git a/libstdc++-v3/include/experimental/optional b/libstdc++-v3/include/experimental/optional
index 197a1fc7691..4a1e71d4234 100644
--- a/libstdc++-v3/include/experimental/optional
+++ b/libstdc++-v3/include/experimental/optional
@@ -690,7 +690,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       void
       swap(optional& __other)
       noexcept(is_nothrow_move_constructible<_Tp>()
-               && noexcept(swap(declval<_Tp&>(), declval<_Tp&>())))
+               && __is_nothrow_swappable<_Tp>::value)
       {
         using std::swap;