diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 14:35:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 14:35:24 +0400 |
| commit | 3c8a4c458bc66cfe54e83c00f2d4460a52e04535 (patch) | |
| tree | 151c0fa579ac0fcdc7230e8224bfdaf3c3c2ed87 /intern/ghost/GHOST_ITimerTask.h | |
| parent | cc0784c1b9c4d813837dedddd5b2b4c52fe291f0 (diff) | |
more guardedalloc use in C++, also make compositorMutex a static var, was allocated and never freed.
Diffstat (limited to 'intern/ghost/GHOST_ITimerTask.h')
| -rw-r--r-- | intern/ghost/GHOST_ITimerTask.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h index bb4a81be5f8..08c4890939f 100644 --- a/intern/ghost/GHOST_ITimerTask.h +++ b/intern/ghost/GHOST_ITimerTask.h @@ -84,14 +84,9 @@ public: */ virtual void setUserData(const GHOST_TUserDataPtr userData) = 0; + #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { - return MEM_mallocN(num_bytes, "GHOST:GHOST_ITimerTask"); - } - void operator delete(void *mem) { - MEM_freeN(mem); - } + MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_ITimerTask") #endif }; |