From cc0784c1b9c4d813837dedddd5b2b4c52fe291f0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 Jun 2012 09:14:37 +0000 Subject: optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro. --- source/gameengine/GameLogic/SCA_IActuator.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source/gameengine/GameLogic/SCA_IActuator.h') diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h index 211a25b84c8..801483bb882 100644 --- a/source/gameengine/GameLogic/SCA_IActuator.h +++ b/source/gameengine/GameLogic/SCA_IActuator.h @@ -160,9 +160,7 @@ public: bool IsType(KX_ACTUATOR_TYPE type) { return m_type == type; } #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IActuator"); } - void operator delete( void *mem ) { MEM_freeN(mem); } + MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_IActuator") #endif }; -- cgit v1.2.3