Browse Source

Added placement delete operators (#1405)

Fixes #1402
Jorrit Rouwe 7 months ago
parent
commit
27559da08b
1 changed files with 4 additions and 2 deletions
  1. 4 2
      Jolt/Core/Memory.h

+ 4 - 2
Jolt/Core/Memory.h

@@ -37,8 +37,10 @@ JPH_EXPORT void RegisterDefaultAllocator();
 	JPH_INLINE void operator delete (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept	{ JPH::AlignedFree(inPointer); } \
 	JPH_INLINE void *operator new[] (size_t inCount, std::align_val_t inAlignment)				{ return JPH::AlignedAllocate(inCount, static_cast<size_t>(inAlignment)); } \
 	JPH_INLINE void operator delete[] (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept	{ JPH::AlignedFree(inPointer); } \
-	JPH_INLINE void *operator new ([[maybe_unused]] size_t inSize, void *inPointer) noexcept	{ return inPointer; } \
-	JPH_INLINE void *operator new[] ([[maybe_unused]] size_t inSize, void *inPointer) noexcept	{ return inPointer; }
+	JPH_INLINE void *operator new ([[maybe_unused]] size_t inCount, void *inPointer) noexcept	{ return inPointer; } \
+	JPH_INLINE void operator delete ([[maybe_unused]] void *inPointer, [[maybe_unused]] void *inPlace) noexcept { /* Do nothing */ } \
+	JPH_INLINE void *operator new[] ([[maybe_unused]] size_t inCount, void *inPointer) noexcept	{ return inPointer; } \
+	JPH_INLINE void operator delete[] ([[maybe_unused]] void *inPointer, [[maybe_unused]] void *inPlace) noexcept { /* Do nothing */ }
 
 #else