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/Rasterizer/RAS_FramingManager.h | |
| parent | 78196d60d1a4585c613f822040f7dc339b9558b4 (diff) | |
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_FramingManager.h')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_FramingManager.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h index fc5adc97657..6312f83737e 100644 --- a/source/gameengine/Rasterizer/RAS_FramingManager.h +++ b/source/gameengine/Rasterizer/RAS_FramingManager.h @@ -163,9 +163,7 @@ private : #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FrameSettings"); } - void operator delete( void *mem ) { MEM_freeN(mem); } + MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_FrameSettings") #endif }; @@ -300,14 +298,11 @@ private : RAS_FramingManager( const RAS_FramingManager & ); - + #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FramingManager"); } - void operator delete( void *mem ) { MEM_freeN(mem); } + MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_FramingManager") #endif }; #endif - |