mirror of https://github.com/PrimeDecomp/prime.git
Cleanup CMemory.hpp
Former-commit-id: e07adcf5bd70240efcd1a17ee36046a5ffac199a
This commit is contained in:
parent
cc41943a2a
commit
043b4d2cb4
|
@ -27,14 +27,6 @@ public:
|
||||||
#ifdef __MWERKS__
|
#ifdef __MWERKS__
|
||||||
void* operator new(size_t sz, const char*, const char*);
|
void* operator new(size_t sz, const char*, const char*);
|
||||||
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
|
#endif
|
||||||
|
|
||||||
// placement new
|
// placement new
|
||||||
|
@ -47,7 +39,7 @@ inline void operator delete[](void* ptr) { CMemory::Free(ptr); }
|
||||||
#else
|
#else
|
||||||
__attribute__((weak)) void operator delete(void* ptr) { CMemory::Free(ptr); }
|
__attribute__((weak)) void operator delete(void* ptr) { CMemory::Free(ptr); }
|
||||||
__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
|
||||||
|
|
||||||
#endif // _CMEMORY
|
#endif // _CMEMORY
|
||||||
|
|
Loading…
Reference in New Issue