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/Network | |
parent | 78196d60d1a4585c613f822040f7dc339b9558b4 (diff) |
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
Diffstat (limited to 'source/gameengine/Network')
-rw-r--r-- | source/gameengine/Network/NG_NetworkDeviceInterface.h | 4 | ||||
-rw-r--r-- | source/gameengine/Network/NG_NetworkMessage.h | 4 | ||||
-rw-r--r-- | source/gameengine/Network/NG_NetworkObject.h | 4 | ||||
-rw-r--r-- | source/gameengine/Network/NG_NetworkScene.h | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/source/gameengine/Network/NG_NetworkDeviceInterface.h b/source/gameengine/Network/NG_NetworkDeviceInterface.h index d4a3d12057e..8f903cc64fa 100644 --- a/source/gameengine/Network/NG_NetworkDeviceInterface.h +++ b/source/gameengine/Network/NG_NetworkDeviceInterface.h @@ -75,9 +75,7 @@ public: #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkDeviceInterface"); } - void operator delete( void *mem ) { MEM_freeN(mem); } + MEM_CXX_CLASS_ALLOC_FUNCS("GE:NG_NetworkDeviceInterface") #endif }; diff --git a/source/gameengine/Network/NG_NetworkMessage.h b/source/gameengine/Network/NG_NetworkMessage.h index 7a55891552f..25e7fd97596 100644 --- a/source/gameengine/Network/NG_NetworkMessage.h +++ b/source/gameengine/Network/NG_NetworkMessage.h @@ -131,9 +131,7 @@ public: #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkMessage"); } - void operator delete( void *mem ) { MEM_freeN(mem); } + MEM_CXX_CLASS_ALLOC_FUNCS("GE:NG_NetworkMessage") #endif }; diff --git a/source/gameengine/Network/NG_NetworkObject.h b/source/gameengine/Network/NG_NetworkObject.h index b7b01bdad06..b9858cd8d43 100644 --- a/source/gameengine/Network/NG_NetworkObject.h +++ b/source/gameengine/Network/NG_NetworkObject.h @@ -48,9 +48,7 @@ public: #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkObject"); } - void operator delete( void *mem ) { MEM_freeN(mem); } + MEM_CXX_CLASS_ALLOC_FUNCS("GE:NG_NetworkObject") #endif }; diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h index b3ca4df9d50..41ac8ead5e4 100644 --- a/source/gameengine/Network/NG_NetworkScene.h +++ b/source/gameengine/Network/NG_NetworkScene.h @@ -111,9 +111,7 @@ protected: #ifdef WITH_CXX_GUARDEDALLOC -public: - void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkScene"); } - void operator delete( void *mem ) { MEM_freeN(mem); } + MEM_CXX_CLASS_ALLOC_FUNCS("GE:NG_NetworkScene") #endif }; |