diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-03-30 19:43:50 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-03-30 19:43:50 +0000 |
| commit | d3209f932f73087c33ccae4b7e7403ca4ad94d28 (patch) | |
| tree | a4d4ecd1a700f0e28d87ac8a2c815673e48f4544 /libcxx/include/optional | |
| parent | 21e8ce398d21f0d89c8c5a52d077305dbf68543a (diff) | |
| download | bcm5719-llvm-d3209f932f73087c33ccae4b7e7403ca4ad94d28.tar.gz bcm5719-llvm-d3209f932f73087c33ccae4b7e7403ca4ad94d28.zip | |
Implement LWG 2842 - optional(U&&) needs to SFINAE on decay_t<in_place_t>
llvm-svn: 299100
Diffstat (limited to 'libcxx/include/optional')
| -rw-r--r-- | libcxx/include/optional | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/optional b/libcxx/include/optional index 002842f5b31..a80120f0075 100644 --- a/libcxx/include/optional +++ b/libcxx/include/optional @@ -531,7 +531,7 @@ private: }; template <class _Up> using _CheckOptionalArgsCtor = conditional_t< - !is_same_v<in_place_t, _Up> && + !is_same_v<decay_t<_Up>, in_place_t> && !is_same_v<decay_t<_Up>, optional>, _CheckOptionalArgsConstructor, __check_tuple_constructor_fail |
