OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix constraint on std::optional assignment [PR 100982]

Browse Source 
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.
This commit is contained in:
Jonathan Wakely 2021-06-09 11:03:15 +01:00
parent ec748dc7dd
commit b3fce1bd45
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libstdc++-v3/include/std/optional
View File

@ -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&>

17
libstdc++-v3/testsuite/20_util/optional/assignment/100982.cc Normal file
View File

@ -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
}