From 043b4d2cb44d8582630bb97ad987416dcd0a19af Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 12 Oct 2023 05:15:48 -0700 Subject: [PATCH] Cleanup CMemory.hpp Former-commit-id: e07adcf5bd70240efcd1a17ee36046a5ffac199a --- include/Kyoto/Alloc/CMemory.hpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/include/Kyoto/Alloc/CMemory.hpp b/include/Kyoto/Alloc/CMemory.hpp index aa2cb55b..e61df860 100644 --- a/include/Kyoto/Alloc/CMemory.hpp +++ b/include/Kyoto/Alloc/CMemory.hpp @@ -27,14 +27,6 @@ public: #ifdef __MWERKS__ void* operator new(size_t sz, const char*, const char*); void* operator new[](size_t sz, const char*, const char*); -// TODO remove - -//inline void* operator new(size_t sz) { return operator new(sz, "??(??)", nullptr); } -#else -/*__attribute__((weak)) void* operator new(size_t sz) { return operator new(sz, "??(??)", nullptr); } -__attribute__((weak)) void* operator new[](size_t sz) { - return operator new[](sz, "??(??)", nullptr); -}*/ #endif // placement new @@ -47,7 +39,7 @@ inline void operator delete[](void* ptr) { CMemory::Free(ptr); } #else __attribute__((weak)) void operator delete(void* ptr) { CMemory::Free(ptr); } __attribute__((weak)) void operator delete[](void* ptr) { CMemory::Free(ptr); } -#define NEW new +#define rs_new new #endif #endif // _CMEMORY