Fix tests on old arm platforms for optional.

	* testsuite/20_util/optional/77288.cc: Don't use exception_ptr.

From-SVN: r240347

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e9bb0ce0fa6d7b4cabf2921384a71b7f5cb7fbe5..16a49549af43fcd00b523f5dec657a8bf7846bfb 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-22  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+       Fix tests on old arm platforms for optional.
+       * testsuite/20_util/optional/77288.cc: Don't use exception_ptr.
+
 2016-09-22  Jonathan Wakely  <jwakely@redhat.com>
 
        * python/libstdcxx/v6/printers.py (StdVariantPrinter): Adjust for

diff --git a/libstdc++-v3/testsuite/20_util/optional/77288.cc b/libstdc++-v3/testsuite/20_util/optional/77288.cc
index eafafb7163935d8b52d3d720bbd55c065fe3a760..0df74a9963cb8173390115d7c0e69ae03ed4f072 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/optional/77288.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/77288.cc
@@ -18,7 +18,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-#include <exception>
 #include <optional>
 #include <any>
 
@@ -28,8 +27,8 @@ using std::optional;
 
 void test01()
 {
-    optional<optional<std::exception_ptr>> nested_element;
-    optional<std::exception_ptr> element = {};
+    optional<optional<int>> nested_element;
+    optional<int> element = {};
     nested_element = element;
     VERIFY(nested_element);
 }