Skip to content

Commit 27559da

Browse files
authored
Added placement delete operators (#1405)
Fixes #1402
1 parent de0b2e9 commit 27559da

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Jolt/Core/Memory.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ JPH_EXPORT void RegisterDefaultAllocator();
3737
JPH_INLINE void operator delete (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept { JPH::AlignedFree(inPointer); } \
3838
JPH_INLINE void *operator new[] (size_t inCount, std::align_val_t inAlignment) { return JPH::AlignedAllocate(inCount, static_cast<size_t>(inAlignment)); } \
3939
JPH_INLINE void operator delete[] (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept { JPH::AlignedFree(inPointer); } \
40-
JPH_INLINE void *operator new ([[maybe_unused]] size_t inSize, void *inPointer) noexcept { return inPointer; } \
41-
JPH_INLINE void *operator new[] ([[maybe_unused]] size_t inSize, void *inPointer) noexcept { return inPointer; }
40+
JPH_INLINE void *operator new ([[maybe_unused]] size_t inCount, void *inPointer) noexcept { return inPointer; } \
41+
JPH_INLINE void operator delete ([[maybe_unused]] void *inPointer, [[maybe_unused]] void *inPlace) noexcept { /* Do nothing */ } \
42+
JPH_INLINE void *operator new[] ([[maybe_unused]] size_t inCount, void *inPointer) noexcept { return inPointer; } \
43+
JPH_INLINE void operator delete[] ([[maybe_unused]] void *inPointer, [[maybe_unused]] void *inPlace) noexcept { /* Do nothing */ }
4244

4345
#else
4446

0 commit comments

Comments
 (0)