summaryrefslogtreecommitdiffstats
path: root/libcxx/include/variant
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2018-02-06 20:56:55 +0000
committerMarshall Clow <mclow.lists@gmail.com>2018-02-06 20:56:55 +0000
commit655c4695cfe3224e514b357773efee77b16d9afb (patch)
treee16ca57c1cb7cd1e9462c2b725309d821d706a0e /libcxx/include/variant
parente96a9014ab3217f18e7d2646efe764cebbb3f7cd (diff)
downloadbcm5719-llvm-655c4695cfe3224e514b357773efee77b16d9afb.tar.gz
bcm5719-llvm-655c4695cfe3224e514b357773efee77b16d9afb.zip
Implement P0777: Treating unnecessay decay
llvm-svn: 324398
Diffstat (limited to 'libcxx/include/variant')
-rw-r--r--libcxx/include/variant8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/variant b/libcxx/include/variant
index 987b8a7982d..63c7677c5d5 100644
--- a/libcxx/include/variant
+++ b/libcxx/include/variant
@@ -1143,9 +1143,9 @@ public:
template <
class _Arg,
- enable_if_t<!is_same_v<decay_t<_Arg>, variant>, int> = 0,
- enable_if_t<!__is_inplace_type<decay_t<_Arg>>::value, int> = 0,
- enable_if_t<!__is_inplace_index<decay_t<_Arg>>::value, int> = 0,
+ enable_if_t<!is_same_v<__uncvref_t<_Arg>, variant>, int> = 0,
+ enable_if_t<!__is_inplace_type<__uncvref_t<_Arg>>::value, int> = 0,
+ enable_if_t<!__is_inplace_index<__uncvref_t<_Arg>>::value, int> = 0,
class _Tp = __variant_detail::__best_match_t<_Arg, _Types...>,
size_t _Ip =
__find_detail::__find_unambiguous_index_sfinae<_Tp, _Types...>::value,
@@ -1215,7 +1215,7 @@ public:
template <
class _Arg,
- enable_if_t<!is_same_v<decay_t<_Arg>, variant>, int> = 0,
+ enable_if_t<!is_same_v<__uncvref_t<_Arg>, variant>, int> = 0,
class _Tp = __variant_detail::__best_match_t<_Arg, _Types...>,
size_t _Ip =
__find_detail::__find_unambiguous_index_sfinae<_Tp, _Types...>::value,
OpenPOWER on IntegriCloud