From e8f3c5aaf43a478ecc74eaa7b360c912999c9f5d Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 31 Dec 2023 09:35:57 -0800 Subject: Use the proper allocator for EffectSlotArray --- core/effectslot.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/effectslot.cpp b/core/effectslot.cpp index 4d1e14b3..6c80317e 100644 --- a/core/effectslot.cpp +++ b/core/effectslot.cpp @@ -14,7 +14,8 @@ EffectSlotArray *EffectSlot::CreatePtrArray(size_t count) noexcept /* Allocate space for twice as many pointers, so the mixer has scratch * space to store a sorted list during mixing. */ - if(void *ptr{al_calloc(alignof(EffectSlotArray), EffectSlotArray::Sizeof(count*2))}) + static constexpr auto AlignVal = std::align_val_t{alignof(EffectSlotArray)}; + if(gsl::owner ptr{::operator new[](EffectSlotArray::Sizeof(count*2), AlignVal)}) return al::construct_at(static_cast(ptr), count); return nullptr; } -- cgit v1.2.3