diff options
Diffstat (limited to 'source/gameengine/Expressions/PyObjectPlus.h')
| -rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h index 124a8e28f57..2fee6aaab92 100644 --- a/source/gameengine/Expressions/PyObjectPlus.h +++ b/source/gameengine/Expressions/PyObjectPlus.h @@ -166,7 +166,7 @@ public: \ void *operator new(size_t num_bytes) { \ return MEM_mallocN(num_bytes, Type.tp_name); \ } \ - void operator delete( void *mem ) { \ + void operator delete(void *mem) { \ MEM_freeN(mem); \ } \ @@ -534,21 +534,11 @@ typedef PyTypeObject *PyParentObject; /* Define the PyParent Object */ #ifdef WITH_CXX_GUARDEDALLOC #define Py_Header \ public: \ - void *operator new(size_t num_bytes) { \ - return MEM_mallocN(num_bytes, "GE:PyObjectPlus"); \ - } \ - void operator delete( void *mem ) { \ - MEM_freeN(mem); \ - } \ + MEM_CXX_CLASS_ALLOC_FUNCS("GE:PyObjectPlus") \ + #define Py_HeaderPtr \ -public: \ - void *operator new(size_t num_bytes) { \ - return MEM_mallocN(num_bytes, "GE:PyObjectPlusPtr"); \ - } \ - void operator delete( void *mem ) { \ - MEM_freeN(mem); \ - } \ + MEM_CXX_CLASS_ALLOC_FUNCS("GE:PyObjectPlusPtr") \ #else // WITH_CXX_GUARDEDALLOC |