@@ -63,7 +63,7 @@ static void* operator_new_impl(std::size_t size) {
63
63
return p;
64
64
}
65
65
66
- _LIBCPP_MAKE_OVERRIDABLE_FUNCTION_DETECTABLE _LIBCPP_WEAK void * operator new (std::size_t size) _THROW_BAD_ALLOC {
66
+ _LIBCPP_OVERRIDABLE_FUNCTION (_Znwm, void *, operator new , (std::size_t size) ) _THROW_BAD_ALLOC {
67
67
void * p = operator_new_impl (size);
68
68
if (p == nullptr )
69
69
__throw_bad_alloc_shim ();
@@ -74,7 +74,7 @@ _LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {
74
74
#if !_LIBCPP_HAS_EXCEPTIONS
75
75
# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
76
76
_LIBCPP_ASSERT_SHIM (
77
- !std::__is_function_overridden ( static_cast <void * (*)(std::size_t )>(&operator new )),
77
+ !std::__is_function_overridden< static_cast <void * (*)(std::size_t )>(&operator new )>( ),
78
78
" libc++ was configured with exceptions disabled and `operator new(size_t)` has been overridden, "
79
79
" but `operator new(size_t, nothrow_t)` has not been overridden. This is problematic because "
80
80
" `operator new(size_t, nothrow_t)` must call `operator new(size_t)`, which will terminate in case "
@@ -94,15 +94,15 @@ _LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {
94
94
#endif
95
95
}
96
96
97
- _LIBCPP_MAKE_OVERRIDABLE_FUNCTION_DETECTABLE _LIBCPP_WEAK void * operator new [](size_t size) _THROW_BAD_ALLOC {
97
+ _LIBCPP_OVERRIDABLE_FUNCTION (_Znam, void *, operator new [], (size_t size) ) _THROW_BAD_ALLOC {
98
98
return ::operator new (size);
99
99
}
100
100
101
101
_LIBCPP_WEAK void * operator new [](size_t size, const std::nothrow_t &) noexcept {
102
102
#if !_LIBCPP_HAS_EXCEPTIONS
103
103
# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
104
104
_LIBCPP_ASSERT_SHIM (
105
- !std::__is_function_overridden ( static_cast <void * (*)(std::size_t )>(&operator new [])),
105
+ !std::__is_function_overridden< static_cast <void * (*)(std::size_t )>(&operator new [])>( ),
106
106
" libc++ was configured with exceptions disabled and `operator new[](size_t)` has been overridden, "
107
107
" but `operator new[](size_t, nothrow_t)` has not been overridden. This is problematic because "
108
108
" `operator new[](size_t, nothrow_t)` must call `operator new[](size_t)`, which will terminate in case "
@@ -156,8 +156,8 @@ static void* operator_new_aligned_impl(std::size_t size, std::align_val_t alignm
156
156
return p;
157
157
}
158
158
159
- _LIBCPP_MAKE_OVERRIDABLE_FUNCTION_DETECTABLE _LIBCPP_WEAK void *
160
- operator new (std:: size_t size, std:: align_val_t alignment) _THROW_BAD_ALLOC {
159
+ _LIBCPP_OVERRIDABLE_FUNCTION (_ZnwmSt11align_val_t, void *, operator new , (std:: size_t size, std:: align_val_t alignment))
160
+ _THROW_BAD_ALLOC {
161
161
void * p = operator_new_aligned_impl (size, alignment);
162
162
if (p == nullptr )
163
163
__throw_bad_alloc_shim ();
@@ -168,7 +168,7 @@ _LIBCPP_WEAK void* operator new(size_t size, std::align_val_t alignment, const s
168
168
# if !_LIBCPP_HAS_EXCEPTIONS
169
169
# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
170
170
_LIBCPP_ASSERT_SHIM (
171
- !std::__is_function_overridden ( static_cast <void * (*)(std::size_t , std::align_val_t )>(&operator new )),
171
+ !std::__is_function_overridden< static_cast <void * (*)(std::size_t , std::align_val_t )>(&operator new )>( ),
172
172
" libc++ was configured with exceptions disabled and `operator new(size_t, align_val_t)` has been overridden, "
173
173
" but `operator new(size_t, align_val_t, nothrow_t)` has not been overridden. This is problematic because "
174
174
" `operator new(size_t, align_val_t, nothrow_t)` must call `operator new(size_t, align_val_t)`, which will "
@@ -188,16 +188,14 @@ _LIBCPP_WEAK void* operator new(size_t size, std::align_val_t alignment, const s
188
188
# endif
189
189
}
190
190
191
- _LIBCPP_MAKE_OVERRIDABLE_FUNCTION_DETECTABLE _LIBCPP_WEAK void *
192
- operator new [](size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC {
193
- return ::operator new (size, alignment);
194
- }
191
+ _LIBCPP_OVERRIDABLE_FUNCTION (_ZnamSt11align_val_t, void *, operator new [], (size_t size, std::align_val_t alignment))
192
+ _THROW_BAD_ALLOC { return ::operator new (size, alignment); }
195
193
196
194
_LIBCPP_WEAK void * operator new [](size_t size, std::align_val_t alignment, const std::nothrow_t &) noexcept {
197
195
# if !_LIBCPP_HAS_EXCEPTIONS
198
196
# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
199
197
_LIBCPP_ASSERT_SHIM (
200
- !std::__is_function_overridden ( static_cast <void * (*)(std::size_t , std::align_val_t )>(&operator new [])),
198
+ !std::__is_function_overridden< static_cast <void * (*)(std::size_t , std::align_val_t )>(&operator new [])>( ),
201
199
" libc++ was configured with exceptions disabled and `operator new[](size_t, align_val_t)` has been overridden, "
202
200
" but `operator new[](size_t, align_val_t, nothrow_t)` has not been overridden. This is problematic because "
203
201
" `operator new[](size_t, align_val_t, nothrow_t)` must call `operator new[](size_t, align_val_t)`, which will "
0 commit comments