diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 13:14:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 13:14:37 +0400 |
| commit | cc0784c1b9c4d813837dedddd5b2b4c52fe291f0 (patch) | |
| tree | c898623170b1576dddeb38f1ef30aa3cc83d6567 /source/gameengine/SceneGraph/SG_Controller.h | |
| parent | 78196d60d1a4585c613f822040f7dc339b9558b4 (diff) | |
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
Diffstat (limited to 'source/gameengine/SceneGraph/SG_Controller.h')
| -rw-r--r-- | source/gameengine/SceneGraph/SG_Controller.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h index 7100debe632..d82738dbb86 100644 --- a/source/gameengine/SceneGraph/SG_Controller.h +++ b/source/gameengine/SceneGraph/SG_Controller.h @@ -43,12 +43,6 @@ class SG_Controller { public: - -#ifdef WITH_CXX_GUARDEDALLOC - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "SG_Controller"); } - void operator delete( void *mem ) { MEM_freeN(mem); } -#endif - SG_Controller( ) : m_pObject(NULL) { @@ -122,6 +116,9 @@ public: protected: SG_IObject* m_pObject; +#ifdef WITH_CXX_GUARDEDALLOC + MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_Controller") +#endif }; #endif //__SG_CONTROLLER_H__ |