Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-25 13:14:37 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-25 13:14:37 +0400
commitcc0784c1b9c4d813837dedddd5b2b4c52fe291f0 (patch)
treec898623170b1576dddeb38f1ef30aa3cc83d6567 /intern/ghost/GHOST_IWindow.h
parent78196d60d1a4585c613f822040f7dc339b9558b4 (diff)
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
Diffstat (limited to 'intern/ghost/GHOST_IWindow.h')
-rw-r--r--intern/ghost/GHOST_IWindow.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h
index e754883504d..69aaeeb4b2e 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@ -306,9 +306,7 @@ public:
virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds) { return GHOST_kSuccess; }
#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IWindow"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IWindow")
#endif
};