diff options
| author | Ville Voutilainen <ville.voutilainen@gmail.com> | 2016-09-22 14:01:29 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville@gcc.gnu.org> | 2016-09-22 14:01:29 +0300 |
| commit | 8a4c4f1273679f493dd513b3dc0e9e1952459bd4 (patch) | |
| tree | 001239357351ed40683859fe372e6126a889edea | |
| parent | 687235522bc9e26d19573af83a4d31095536f97a (diff) | |
| download | gcc-8a4c4f1273679f493dd513b3dc0e9e1952459bd4.zip gcc-8a4c4f1273679f493dd513b3dc0e9e1952459bd4.tar.gz gcc-8a4c4f1273679f493dd513b3dc0e9e1952459bd4.tar.bz2 | |
Fix tests on old arm platforms for optional.
* testsuite/20_util/optional/77288.cc: Don't use exception_ptr.
From-SVN: r240347
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/optional/77288.cc | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e9bb0ce..16a4954 100644 --- 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 eafafb7..0df74a9 100644 --- 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); } |