diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-06-09 11:03:15 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-06-09 12:45:11 +0100 |
| commit | b3fce1bd45f72cc9e55fb7431762e92e30fefcf1 (patch) | |
| tree | e9e8777f0e650c27af48807ad3633ae015815550 /libstdc++-v3 | |
| parent | ec748dc7dd2d8ca39dc503b2a6dfbe172127cd13 (diff) | |
| download | gcc-b3fce1bd45f72cc9e55fb7431762e92e30fefcf1.zip gcc-b3fce1bd45f72cc9e55fb7431762e92e30fefcf1.tar.gz gcc-b3fce1bd45f72cc9e55fb7431762e92e30fefcf1.tar.bz2 | |
libstdc++: Fix constraint on std::optional assignment [PR 100982]
libstdc++-v3/ChangeLog:
PR libstdc++/100982
* include/std/optional (optional::operator=(const optional<U>&)):
Fix value category used in is_assignable check.
* testsuite/20_util/optional/assignment/100982.cc: New test.
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/include/std/optional | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/optional/assignment/100982.cc | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index 415f8c4..0a67ce2 100644 --- a/libstdc++-v3/include/std/optional +++ b/libstdc++-v3/include/std/optional @@ -815,7 +815,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Up> enable_if_t<__and_v<__not_<is_same<_Tp, _Up>>, is_constructible<_Tp, const _Up&>, - is_assignable<_Tp&, _Up>, + is_assignable<_Tp&, const _Up&>, __not_<__converts_from_optional<_Tp, _Up>>, __not_<__assigns_from_optional<_Tp, _Up>>>, optional&> diff --git a/libstdc++-v3/testsuite/20_util/optional/assignment/100982.cc b/libstdc++-v3/testsuite/20_util/optional/assignment/100982.cc new file mode 100644 index 0000000..ae56525 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/optional/assignment/100982.cc @@ -0,0 +1,17 @@ +// { dg-do compile { target c++17 } } + +#include <optional> + +struct U {}; + +struct T { + explicit T(const U&); + T& operator=(const U&); + T& operator=(U&&) = delete; +}; + +int main() { + std::optional<U> opt1; + std::optional<T> opt2; + opt2 = opt1; // PR libstdc++/100982 +} |