diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-06-19 10:06:00 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-06-19 18:09:28 +0000 |
| commit | 23408297fbf3089f0388a8873b02fa75ab3f5bb9 (patch) | |
| tree | 73e65506c89dcf58daeb8b774b921a8d688d133b /contrib/llvm-project/libcxx/include | |
| parent | cac129e6030095c33e95c5ce1cdcb9c5c21efce9 (diff) | |
| parent | e4bbddaec8689e1b24f25e88958bea700e989542 (diff) | |
| download | src-23408297fbf3089f0388a8873b02fa75ab3f5bb9.tar.gz src-23408297fbf3089f0388a8873b02fa75ab3f5bb9.zip | |
Merge llvm-project 12.0.1 rc2
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-12.0.1-rc2-0-ge7dac564cd0e, a.k.a. 12.0.1 rc2.
PR: 255570
MFC after: 6 weeks
Diffstat (limited to 'contrib/llvm-project/libcxx/include')
| -rw-r--r-- | contrib/llvm-project/libcxx/include/memory | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/contrib/llvm-project/libcxx/include/memory b/contrib/llvm-project/libcxx/include/memory index 39d0f5bee6a5..efb10c8fd25b 100644 --- a/contrib/llvm-project/libcxx/include/memory +++ b/contrib/llvm-project/libcxx/include/memory @@ -99,14 +99,14 @@ struct allocator_traits }; template <> -class allocator<void> // deprecated in C++17, removed in C++20 +class allocator<void> // removed in C++20 { public: - typedef void* pointer; - typedef const void* const_pointer; - typedef void value_type; + typedef void* pointer; // deprecated in C++17 + typedef const void* const_pointer; // deprecated in C++17 + typedef void value_type; // deprecated in C++17 - template <class _Up> struct rebind {typedef allocator<_Up> other;}; + template <class _Up> struct rebind {typedef allocator<_Up> other;}; // deprecated in C++17 }; template <class T> @@ -786,27 +786,27 @@ to_address(const _Pointer& __p) _NOEXCEPT template <class _Tp> class allocator; -#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_ALLOCATOR_MEMBERS) +#if _LIBCPP_STD_VER <= 17 template <> -class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 allocator<void> +class _LIBCPP_TEMPLATE_VIS allocator<void> { public: - typedef void* pointer; - typedef const void* const_pointer; - typedef void value_type; + _LIBCPP_DEPRECATED_IN_CXX17 typedef void* pointer; + _LIBCPP_DEPRECATED_IN_CXX17 typedef const void* const_pointer; + _LIBCPP_DEPRECATED_IN_CXX17 typedef void value_type; - template <class _Up> struct rebind {typedef allocator<_Up> other;}; + template <class _Up> struct _LIBCPP_DEPRECATED_IN_CXX17 rebind {typedef allocator<_Up> other;}; }; template <> -class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 allocator<const void> +class _LIBCPP_TEMPLATE_VIS allocator<const void> { public: - typedef const void* pointer; - typedef const void* const_pointer; - typedef const void value_type; + _LIBCPP_DEPRECATED_IN_CXX17 typedef const void* pointer; + _LIBCPP_DEPRECATED_IN_CXX17 typedef const void* const_pointer; + _LIBCPP_DEPRECATED_IN_CXX17 typedef const void value_type; - template <class _Up> struct rebind {typedef allocator<_Up> other;}; + template <class _Up> struct _LIBCPP_DEPRECATED_IN_CXX17 rebind {typedef allocator<_Up> other;}; }; #endif |