diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-03-20 11:40:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-05-14 11:43:05 +0000 |
| commit | 349cc55c9796c4596a5b9904cd3281af295f878f (patch) | |
| tree | 410c5a785075730a35f1272ca6a7adf72222ad03 /contrib/llvm-project/libcxx/include/__utility/in_place.h | |
| parent | cb2ae6163174b90e999326ecec3699ee093a5d43 (diff) | |
| parent | c0981da47d5696fe36474fcf86b4ce03ae3ff818 (diff) | |
Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-10186-gff7f2cfa959b.
PR: 261742
MFC after: 2 weeks
Diffstat (limited to 'contrib/llvm-project/libcxx/include/__utility/in_place.h')
| -rw-r--r-- | contrib/llvm-project/libcxx/include/__utility/in_place.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/contrib/llvm-project/libcxx/include/__utility/in_place.h b/contrib/llvm-project/libcxx/include/__utility/in_place.h index 964d08332747..846b4a6d4dfb 100644 --- a/contrib/llvm-project/libcxx/include/__utility/in_place.h +++ b/contrib/llvm-project/libcxx/include/__utility/in_place.h @@ -16,9 +16,6 @@ #pragma GCC system_header #endif -_LIBCPP_PUSH_MACROS -#include <__undef_macros> - _LIBCPP_BEGIN_NAMESPACE_STD #if _LIBCPP_STD_VER > 14 @@ -26,21 +23,21 @@ _LIBCPP_BEGIN_NAMESPACE_STD struct _LIBCPP_TYPE_VIS in_place_t { explicit in_place_t() = default; }; -_LIBCPP_INLINE_VAR constexpr in_place_t in_place{}; +inline constexpr in_place_t in_place{}; template <class _Tp> struct _LIBCPP_TEMPLATE_VIS in_place_type_t { explicit in_place_type_t() = default; }; template <class _Tp> -_LIBCPP_INLINE_VAR constexpr in_place_type_t<_Tp> in_place_type{}; +inline constexpr in_place_type_t<_Tp> in_place_type{}; template <size_t _Idx> struct _LIBCPP_TEMPLATE_VIS in_place_index_t { explicit in_place_index_t() = default; }; template <size_t _Idx> -_LIBCPP_INLINE_VAR constexpr in_place_index_t<_Idx> in_place_index{}; +inline constexpr in_place_index_t<_Idx> in_place_index{}; template <class _Tp> struct __is_inplace_type_imp : false_type {}; template <class _Tp> struct __is_inplace_type_imp<in_place_type_t<_Tp>> : true_type {}; @@ -58,6 +55,4 @@ using __is_inplace_index = __is_inplace_index_imp<__uncvref_t<_Tp>>; _LIBCPP_END_NAMESPACE_STD -_LIBCPP_POP_MACROS - #endif // _LIBCPP___UTILITY_IN_PLACE_H |