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 /intern/ghost/GHOST_IEvent.h | |
parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'intern/ghost/GHOST_IEvent.h')
-rw-r--r-- | intern/ghost/GHOST_IEvent.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index 3c3111a2e6d..ef63c57caa5 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -86,13 +86,7 @@ public: virtual GHOST_TEventDataPtr getData() = 0; #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { - return MEM_mallocN(num_bytes, "GHOST:GHOST_IEvent"); - } - void operator delete(void *mem) { - MEM_freeN(mem); - } + MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IEvent") #endif }; |