diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2020-06-09 22:13:37 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2020-06-09 22:14:43 +0100 |
commit | d3647057913d3671312a79a77be02fc459d89fb6 (patch) | |
tree | 400c5265699f233b5f45d57b2ff2584b1282bf28 | |
parent | d7274dbf82001ae52e5c9a514129b49152498d40 (diff) | |
download | gcc-d3647057913d3671312a79a77be02fc459d89fb6.zip gcc-d3647057913d3671312a79a77be02fc459d89fb6.tar.gz gcc-d3647057913d3671312a79a77be02fc459d89fb6.tar.bz2 |
libstdc++: Define std::bad_optional_access constructor as defaulted
The standard requires that std::bad_optional_access' default
constructor has a non-throwing exception specification.
* include/std/optional (bad_optional_access): Define default
constructor and destructor as defaulted.
* testsuite/20_util/optional/bad_access.cc: New test.
-rw-r--r-- | libstdc++-v3/include/std/optional | 7 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/optional/bad_access.cc | 27 |
2 files changed, 30 insertions, 4 deletions
diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index 37c2ba7..b0184a4 100644 --- a/libstdc++-v3/include/std/optional +++ b/libstdc++-v3/include/std/optional @@ -84,12 +84,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION class bad_optional_access : public exception { public: - bad_optional_access() { } + bad_optional_access() = default; + virtual ~bad_optional_access() = default; - virtual const char* what() const noexcept override + const char* what() const noexcept override { return "bad optional access"; } - - virtual ~bad_optional_access() noexcept = default; }; void diff --git a/libstdc++-v3/testsuite/20_util/optional/bad_access.cc b/libstdc++-v3/testsuite/20_util/optional/bad_access.cc new file mode 100644 index 0000000..6ebb3e2 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/optional/bad_access.cc @@ -0,0 +1,27 @@ +// Copyright (C) 2020 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-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +#include <optional> + +using std::bad_optional_access; + +static_assert( std::is_nothrow_default_constructible_v<bad_optional_access> ); +static_assert( std::is_nothrow_copy_constructible_v<bad_optional_access> ); +static_assert( std::is_nothrow_copy_assignable_v<bad_optional_access> ); |