Implement P0504R0: Revisiting in-place tag types for any/optional/variant
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287250 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/any b/include/any
index 229daca..1f70c4f 100644
--- a/include/any
+++ b/include/any
@@ -200,7 +200,7 @@
, class _Tp = decay_t<_ValueType>
, class = enable_if_t<
!is_same<_Tp, any>::value &&
- !__is_inplace_type_tag<_ValueType>::value &&
+ !__is_inplace_type<_ValueType>::value &&
is_copy_constructible<_Tp>::value>
>
_LIBCPP_INLINE_VISIBILITY
@@ -561,13 +561,13 @@
template <class _Tp, class ..._Args>
inline _LIBCPP_INLINE_VISIBILITY
any make_any(_Args&&... __args) {
- return any(in_place<_Tp>, _VSTD::forward<_Args>(__args)...);
+ return any(in_place_type<_Tp>, _VSTD::forward<_Args>(__args)...);
}
template <class _Tp, class _Up, class ..._Args>
inline _LIBCPP_INLINE_VISIBILITY
any make_any(initializer_list<_Up> __il, _Args&&... __args) {
- return any(in_place<_Tp>, __il, _VSTD::forward<_Args>(__args)...);
+ return any(in_place_type<_Tp>, __il, _VSTD::forward<_Args>(__args)...);
}
template <class _ValueType>