diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
commit | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (patch) | |
tree | 47455f2482f6eca0352c10c57482641eec6afb57 /source/gameengine/SceneGraph/SG_Controller.h | |
parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) |
Merged changes in the trunk up to revision 48505.
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__ |