diff options
| author | Marc Glisse <marc.glisse@inria.fr> | 2017-05-16 12:54:16 +0000 |
|---|---|---|
| committer | Marc Glisse <marc.glisse@inria.fr> | 2017-05-16 12:54:16 +0000 |
| commit | 4c7c1c879df2f95b10fa59af83f2bf2e637b7197 (patch) | |
| tree | 4dbdb0b7f129e5b9df2321eb95875e368a5e7e23 | |
| parent | 3fc27c45003cba5a5e9ca73a8d9f9caca131b06f (diff) | |
2017-05-16 Marc Glisse <marc.glisse@inria.fr>
* include/std/optional (_Optional_base::_M_get): Check precondition.
* testsuite/20_util/optional/cons/value_neg.cc: Update line numbers.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@248099 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/optional | 10 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/optional/cons/value_neg.cc | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f228a394b60..0fea52b7f40 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2017-05-16 Marc Glisse <marc.glisse@inria.fr> + + * include/std/optional (_Optional_base::_M_get): Check precondition. + * testsuite/20_util/optional/cons/value_neg.cc: Update line numbers. + 2017-05-16 Jonathan Wakely <jwakely@redhat.com> * doc/xml/manual/appendix_contributing.xml: Link to test docs and diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index 5aa926f0cfd..c697c1682a6 100644 --- a/libstdc++-v3/include/std/optional +++ b/libstdc++-v3/include/std/optional @@ -386,11 +386,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // The _M_get operations have _M_engaged as a precondition. constexpr _Tp& _M_get() noexcept - { return this->_M_payload._M_payload; } + { + __glibcxx_assert(_M_is_engaged()); + return this->_M_payload._M_payload; + } constexpr const _Tp& _M_get() const noexcept - { return this->_M_payload._M_payload; } + { + __glibcxx_assert(_M_is_engaged()); + return this->_M_payload._M_payload; + } // The _M_construct operation has !_M_engaged as a precondition // while _M_destruct has _M_engaged as a precondition. diff --git a/libstdc++-v3/testsuite/20_util/optional/cons/value_neg.cc b/libstdc++-v3/testsuite/20_util/optional/cons/value_neg.cc index 5abe26e433d..524e302fec1 100644 --- a/libstdc++-v3/testsuite/20_util/optional/cons/value_neg.cc +++ b/libstdc++-v3/testsuite/20_util/optional/cons/value_neg.cc @@ -37,8 +37,8 @@ int main() std::optional<std::unique_ptr<int>> oup2 = new int; // { dg-error "conversion" } struct U { explicit U(std::in_place_t); }; std::optional<U> ou(std::in_place); // { dg-error "no matching" } - // { dg-error "no type" "" { target { *-*-* } } 487 } - // { dg-error "no type" "" { target { *-*-* } } 497 } - // { dg-error "no type" "" { target { *-*-* } } 554 } + // { dg-error "no type" "" { target { *-*-* } } 493 } + // { dg-error "no type" "" { target { *-*-* } } 503 } + // { dg-error "no type" "" { target { *-*-* } } 560 } } } |