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/BlenderRoutines/KX_BlenderMouseDevice.h | |
| parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
| parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) | |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h')
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h index 1c54b2fc000..0571cafd7a1 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h @@ -51,9 +51,7 @@ public: #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderMouseDevice"); } - void operator delete(void *mem) { MEM_freeN(mem); } + MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderMouseDevice") #endif }; |