@@ -104,18 +104,6 @@ void operator delete[](void* ptr, void*) noexcept;
104
104
#endif
105
105
106
106
#if defined(__cpp_sized_deallocation) && __cpp_sized_deallocation >= 201309L
107
- # define _LIBCPP_HAS_LANGUAGE_SIZED_DEALLOCATION 1
108
- #else
109
- # define _LIBCPP_HAS_LANGUAGE_SIZED_DEALLOCATION 0
110
- #endif
111
-
112
- #if _LIBCPP_STD_VER >= 14 || _LIBCPP_HAS_LANGUAGE_SIZED_DEALLOCATION
113
- # define _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION 1
114
- #else
115
- # define _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION 0
116
- #endif
117
-
118
- #if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION && _LIBCPP_HAS_LANGUAGE_SIZED_DEALLOCATION
119
107
# define _LIBCPP_HAS_SIZED_DEALLOCATION 1
120
108
#else
121
109
# define _LIBCPP_HAS_SIZED_DEALLOCATION 0
@@ -214,7 +202,7 @@ inline constexpr destroying_delete_t destroying_delete{};
214
202
_LIBCPP_NOALIAS;
215
203
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete (void * __p) _NOEXCEPT;
216
204
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete (void * __p, const std::nothrow_t &) _NOEXCEPT;
217
- # if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION
205
+ # if _LIBCPP_HAS_SIZED_DEALLOCATION
218
206
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete (void * __p, std::size_t __sz) _NOEXCEPT;
219
207
# endif
220
208
@@ -223,7 +211,7 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete(void* __p, std::size_t __sz) _
223
211
_LIBCPP_NOALIAS;
224
212
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[] (void * __p) _NOEXCEPT;
225
213
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[] (void * __p, const std::nothrow_t &) _NOEXCEPT;
226
- # if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION
214
+ # if _LIBCPP_HAS_SIZED_DEALLOCATION
227
215
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[] (void * __p, std::size_t __sz) _NOEXCEPT;
228
216
# endif
229
217
@@ -233,7 +221,7 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[](void* __p, std::size_t __sz)
233
221
operator new (std::size_t __sz, std::align_val_t , const std::nothrow_t &) _NOEXCEPT _LIBCPP_NOALIAS;
234
222
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete (void * __p, std::align_val_t ) _NOEXCEPT;
235
223
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete (void * __p, std::align_val_t , const std::nothrow_t &) _NOEXCEPT;
236
- # if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION
224
+ # if _LIBCPP_HAS_SIZED_DEALLOCATION
237
225
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete (void * __p, std::size_t __sz, std::align_val_t ) _NOEXCEPT;
238
226
# endif
239
227
@@ -243,7 +231,7 @@ operator new[](std::size_t __sz, std::align_val_t) _THROW_BAD_ALLOC;
243
231
operator new [](std::size_t __sz, std::align_val_t , const std::nothrow_t &) _NOEXCEPT _LIBCPP_NOALIAS;
244
232
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[] (void * __p, std::align_val_t ) _NOEXCEPT;
245
233
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[] (void * __p, std::align_val_t , const std::nothrow_t &) _NOEXCEPT;
246
- # if _LIBCPP_HAS_LIBRARY_SIZED_DEALLOCATION
234
+ # if _LIBCPP_HAS_SIZED_DEALLOCATION
247
235
_LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[] (void * __p, std::size_t __sz, std::align_val_t ) _NOEXCEPT;
248
236
# endif
249
237
# endif
0 commit comments