diff --git a/stl/inc/generator b/stl/inc/generator index 0df72ea1c9..826f20ff9a 100644 --- a/stl/inc/generator +++ b/stl/inc/generator @@ -128,7 +128,7 @@ private: } static void __stdcall _Dealloc_delete(void* const _Ptr, const size_t _Size) noexcept { - ::operator delete[](_Ptr, _Size + sizeof(_Dealloc_fn)); + ::operator delete(_Ptr, _Size + sizeof(_Dealloc_fn)); } template @@ -164,7 +164,7 @@ private: public: static void* operator new(const size_t _Size) { // default: new/delete - void* const _Ptr = ::operator new[](_Size + sizeof(_Dealloc_fn)); + void* const _Ptr = ::operator new(_Size + sizeof(_Dealloc_fn)); const _Dealloc_fn _Dealloc = _Dealloc_delete; _CSTD memcpy(static_cast(_Ptr) + _Size, &_Dealloc, sizeof(_Dealloc_fn)); return _Ptr; diff --git a/tests/std/tests/P2502R2_generator_promise/test.cpp b/tests/std/tests/P2502R2_generator_promise/test.cpp index 43958421fd..3266ba2572 100644 --- a/tests/std/tests/P2502R2_generator_promise/test.cpp +++ b/tests/std/tests/P2502R2_generator_promise/test.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -22,6 +23,16 @@ using namespace std; +#pragma warning(disable : 28251) // Inconsistent annotation for 'new[]': this instance has no annotations. + +void* operator new[](size_t) { + abort(); +} + +void operator delete[](void*) noexcept { + abort(); +} + template concept HasOperatorNew = requires(Args&&... args) { { Promise::operator new(forward(args)...) } -> same_as;