optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.

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
 };
 

intern/ghost/GHOST_IEventConsumer.h

@@ -64,9 +64,7 @@ public:
 	virtual bool processEvent(GHOST_IEvent *event) = 0;
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IEventConsumer"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IEventConsumer")
 #endif
 };
 

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
 };
 

intern/ghost/GHOST_Rect.h

@@ -190,9 +190,7 @@ public:
 	GHOST_TInt32 m_b;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_Rect"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_Rect")
 #endif
 };
 

intern/ghost/intern/GHOST_WindowManager.h

@@ -162,9 +162,7 @@ protected:
 	GHOST_IWindow *m_activeWindowBeforeFullScreen;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_WindowManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_WindowManager")
 #endif
 	
 };

intern/guardedalloc/MEM_guardedalloc.h

@@ -167,7 +167,27 @@ extern "C" {
 #ifndef NDEBUG
 const char *MEM_name_ptr(void *vmemh);
 #endif
-	
+
+#ifdef __cplusplus
+/* alloc funcs for C++ only */
+#define MEM_CXX_CLASS_ALLOC_FUNCS(_id)                                        \
+public:                                                                       \
+	void *operator new(size_t num_bytes) {                                    \
+		return MEM_mallocN(num_bytes, _id);                                   \
+	}                                                                         \
+	void operator delete(void *mem) {                                         \
+		MEM_freeN(mem);                                                       \
+	}                                                                         \
+	void *operator new[](size_t num_bytes) {                                  \
+		return MEM_mallocN(num_bytes, _id "[]");                              \
+	}                                                                         \
+	void operator delete[](void *mem) {                                       \
+		MEM_freeN(mem);                                                       \
+	}                                                                         \
+
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif

intern/string/STR_String.h

@@ -204,9 +204,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
-	void operator delete(void *mem) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("CXX:STR_String")
 #endif
 };
 

source/blender/compositor/intern/COM_Converter.h

@@ -66,5 +66,9 @@ public:
 	 * @see SocketConnection - a link between two sockets
 	 */
 	static void convertResolution(SocketConnection *connection, ExecutionSystem *system);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:Converter")
+#endif
 };
 #endif

source/blender/compositor/intern/COM_Device.h

@@ -48,6 +48,9 @@ public:
 	 */
 	virtual void execute(WorkPackage *work) = 0;
 
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:Device")
+#endif
 };
 
 #endif

source/blender/compositor/intern/COM_ExecutionGroup.h

@@ -394,7 +394,10 @@ public:
 	 * @see ExecutionSystem.execute
 	 */
 	CompositorPriority getRenderPriotrity();
-	
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionGroup")
+#endif
 };
 
 #endif

source/blender/compositor/intern/COM_ExecutionSystem.h

@@ -232,5 +232,9 @@ private:
 	
 	void executeGroups(CompositorPriority priority);
 
-};
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionSystem")
 #endif
+};
+
+#endif /* _COM_ExecutionSystem_h */

source/blender/compositor/intern/COM_ExecutionSystemHelper.h

@@ -123,5 +123,10 @@ public:
 	 * @param system the execution system to dump
 	 */
 	static void debugDump(ExecutionSystem *system);
-};
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionSystemHelper")
 #endif
+};
+
+#endif /* _COM_ExecutionSystemHelper_h */

source/blender/compositor/intern/COM_MemoryBuffer.h

@@ -166,6 +166,10 @@ public:
 	float *convertToValueBuffer();
 private:
 	unsigned int determineBufferSize();
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryBuffer")
+#endif
 };
 
 #endif

source/blender/compositor/intern/COM_MemoryProxy.h

@@ -102,6 +102,10 @@ public:
 	 * @brief get the allocated memory
 	 */
 	inline MemoryBuffer *getBuffer() { return this->buffer; }
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryProxy")
+#endif
 };
 
 #endif

source/blender/compositor/intern/COM_NodeBase.h

@@ -141,6 +141,11 @@ protected:
 	 */
 	void addOutputSocket(DataType datatype);
 	void addOutputSocket(DataType datatype, bNodeSocket *socket);
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeBase")
+#endif
 };
 
 #endif

source/blender/compositor/intern/COM_Socket.h

@@ -74,6 +74,9 @@ public:
 	void setEditorSocket(bNodeSocket *editorSocket) { this->editorSocket = editorSocket; }
 	bNodeSocket *getbNodeSocket() const { return this->editorSocket; }
 	
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:Socket")
+#endif
 };
 
 

source/blender/compositor/intern/COM_SocketConnection.h

@@ -118,6 +118,10 @@ public:
 	 * @return needs conversion [true:false]
 	 */
 	bool needsResolutionConversion() const;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketConnection")
+#endif
 };
 
 #endif

source/blender/compositor/intern/COM_SocketReader.h

@@ -106,6 +106,10 @@ public:
 
 	inline const unsigned int getWidth() const { return this->width; }
 	inline const unsigned int getHeight() const { return this->height; }
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketReader")
+#endif
 };
 
-#endif
+#endif /* _COM_SocketReader_h */

source/blender/compositor/intern/COM_WorkPackage.h

@@ -59,6 +59,10 @@ public:
 	 * @brief get the number of the chunk
 	 */
 	unsigned int getChunkNumber() const { return this->chunkNumber; }
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkPackage")
+#endif
 };
 
 #endif

source/blender/compositor/intern/COM_WorkScheduler.h

@@ -110,5 +110,10 @@ public:
 	 * @see CompositorContext.getHasActiveOpenCLDevices
 	 */
 	static bool hasGPUDevices();
-};
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkScheduler")
 #endif
+};
+
+#endif /* _COM_WorkScheduler_h_ */

source/gameengine/BlenderRoutines/KX_BlenderCanvas.h

@@ -194,9 +194,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderCanvas")
 #endif
 };
 

source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h

@@ -72,9 +72,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
-	void operator delete(void *mem) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_BlenderInputDevice")
 #endif
 };
 #endif //__KX_BLENDERINPUTDEVICE_H__

source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h

@@ -55,9 +55,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
-	void operator delete(void *mem) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderKeyboardDevice")
 #endif
 };
 

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
 };
 

source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h

@@ -108,9 +108,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderRenderTools"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderRenderTools")
 #endif
 };
 

source/gameengine/BlenderRoutines/KX_BlenderSystem.h

@@ -49,9 +49,7 @@ public:
 	virtual double GetTimeInSeconds();
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSystem"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderSystem")
 #endif
 };
 

source/gameengine/Converter/BL_DeformableGameObject.h

@@ -100,9 +100,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DeformableGameObject"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_DeformableGameObject")
 #endif
 };
 

source/gameengine/Converter/BL_MeshDeformer.h

@@ -90,9 +90,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_MeshDeformer"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_MeshDeformer")
 #endif
 };
 

source/gameengine/Converter/BL_ModifierDeformer.h

@@ -107,9 +107,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ModifierDeformer"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ModifierDeformer")
 #endif
 };
 

source/gameengine/Converter/BL_ShapeDeformer.h

@@ -79,9 +79,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ShapeDeformer")
 #endif
 };
 

source/gameengine/Converter/BL_SkinDeformer.h

@@ -116,9 +116,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_SkinDeformer"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_SkinDeformer")
 #endif
 };
 

source/gameengine/Converter/BlenderWorldInfo.h

@@ -100,9 +100,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BlenderWorldInfo"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BlenderWorldInfo")
 #endif
 };
 

source/gameengine/Converter/KX_BlenderScalarInterpolator.h

@@ -55,9 +55,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ScalarInterpolator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ScalarInterpolator")
 #endif
 };
 
@@ -71,9 +69,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_InterpolatorList"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_InterpolatorList")
 #endif
 };
 

source/gameengine/Converter/KX_BlenderSceneConverter.h

@@ -191,9 +191,7 @@ public:
 #endif
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSceneConverter"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderSceneConverter")
 #endif
 };
 

source/gameengine/Converter/KX_SoftBodyDeformer.h

@@ -93,9 +93,7 @@ protected:
 	//class RAS_MeshObject	*m_pMesh;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ShapeDeformer")
 #endif
 };
 

source/gameengine/Expressions/BoolValue.h

@@ -56,11 +56,8 @@ public:
 private:
 	bool				m_bool;
 
-
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CBoolValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CBoolValue")
 #endif
 };
 

source/gameengine/Expressions/ConstExpr.h

@@ -47,9 +47,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CConstExpr"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CConstExpr")
 #endif
 };
 

source/gameengine/Expressions/EmptyValue.h

@@ -41,9 +41,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CEmptyValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CEmptyValue")
 #endif
 };
 

source/gameengine/Expressions/ErrorValue.h

@@ -39,9 +39,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CErrorValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CErrorValue")
 #endif
 };
 

source/gameengine/Expressions/Expression.h

@@ -74,9 +74,7 @@ class CBrokenLinkInfo
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CBrokenLinkInfo"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CBrokenLinkInfo")
 #endif
 };
 
@@ -144,9 +142,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CExpression"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CExpression")
 #endif
 };
 

source/gameengine/Expressions/FloatValue.h

@@ -50,9 +50,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CFloatValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CFloatValue")
 #endif
 };
 

source/gameengine/Expressions/IdentifierExpr.h

@@ -52,9 +52,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIdentifierExpr"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CIdentifierExpr")
 #endif
 };
 

source/gameengine/Expressions/IfExpr.h

@@ -51,9 +51,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIfExpr"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CIfExpr")
 #endif
 };
 

source/gameengine/Expressions/InputParser.h

@@ -110,9 +110,7 @@ private:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CParser"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CParser")
 #endif
 };
 

source/gameengine/Expressions/IntValue.h

@@ -65,9 +65,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIntValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CIntValue")
 #endif
 };
 

source/gameengine/Expressions/KX_HashedPtr.h

@@ -54,9 +54,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CHashedPtr"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CHashedPtr")
 #endif
 };
 

source/gameengine/Expressions/Operator1Expr.h

@@ -52,9 +52,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:")
 #endif
 };
 

source/gameengine/Expressions/Operator2Expr.h

@@ -58,9 +58,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator2Expr"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:COperator2Expr")
 #endif
 };
 

source/gameengine/Expressions/PyObjectPlus.h

@@ -534,21 +534,11 @@ typedef PyTypeObject *PyParentObject;  /* Define the PyParent Object */
 #ifdef WITH_CXX_GUARDEDALLOC
 #define Py_Header                                                             \
 public:                                                                       \
-	void *operator new(size_t num_bytes) {                                    \
-		return MEM_mallocN(num_bytes, "GE:PyObjectPlus");                     \
-	}                                                                         \
-	void operator delete( void *mem ) {                                       \
-		MEM_freeN(mem);                                                       \
-	}                                                                         \
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:PyObjectPlus")                              \
+
 
 #define Py_HeaderPtr                                                          \
-public:                                                                       \
-	void *operator new(size_t num_bytes) {                                    \
-		return MEM_mallocN(num_bytes, "GE:PyObjectPlusPtr");                  \
-	}                                                                         \
-	void operator delete( void *mem ) {                                       \
-	MEM_freeN(mem);                                                           \
-	}                                                                         \
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:PyObjectPlusPtr")                           \
 
 #else // WITH_CXX_GUARDEDALLOC
 

source/gameengine/Expressions/StringValue.h

@@ -53,9 +53,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CStringValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CStringValue")
 #endif
 };
 

source/gameengine/Expressions/Value.h

@@ -164,9 +164,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CAction"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CAction")
 #endif
 };
 
@@ -436,11 +434,8 @@ public:
 protected:
 	STR_String					m_strNewName;				    // Identification
 
-
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CPropValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CPropValue")
 #endif
 };
 

source/gameengine/Expressions/VectorValue.h

@@ -86,9 +86,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CVectorValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CVectorValue")
 #endif
 };
 

source/gameengine/Expressions/VoidValue.h

@@ -66,9 +66,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CVoidValue"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:CVoidValue")
 #endif
 };
 

source/gameengine/GameLogic/SCA_ActuatorEventManager.h

@@ -49,9 +49,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ActuatorEventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_ActuatorEventManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_AlwaysEventManager.h

@@ -43,9 +43,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_AlwaysEventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_AlwaysEventManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_BasicEventManager.h

@@ -50,9 +50,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_BasicEventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_BasicEventManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_EventManager.h

@@ -84,9 +84,7 @@ protected:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_EventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_EventManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_ExpressionController.h

@@ -59,9 +59,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ExpressionController"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_ExpressionController")
 #endif
 };
 

source/gameengine/GameLogic/SCA_IActuator.h

@@ -160,9 +160,7 @@ public:
 	bool IsType(KX_ACTUATOR_TYPE type) { return m_type == type; }
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IActuator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_IActuator")
 #endif
 };
 

source/gameengine/GameLogic/SCA_IInputDevice.h

@@ -316,9 +316,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_InputEvent"); }
-	void operator delete(void *mem) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_InputEvent")
 #endif
 };
 

source/gameengine/GameLogic/SCA_IScene.h

@@ -74,9 +74,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IScene"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_IScene")
 #endif
 };
 

source/gameengine/GameLogic/SCA_JoystickManager.h

@@ -51,9 +51,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_JoystickManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_JoystickManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_KeyboardManager.h

@@ -59,9 +59,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_KeyboardManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_KeyboardManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_LogicManager.h

@@ -147,9 +147,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_LogicManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_LogicManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_MouseManager.h

@@ -68,9 +68,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_MouseManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_MouseManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_PropertyEventManager.h

@@ -48,9 +48,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_PropertyEventManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_RandomEventManager.h

@@ -47,9 +47,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomEventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_RandomEventManager")
 #endif
 };
 

source/gameengine/GameLogic/SCA_RandomNumberGenerator.h

@@ -77,9 +77,7 @@ class SCA_RandomNumberGenerator {
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomNumberGenerator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_RandomNumberGenerator")
 #endif
 };
 

source/gameengine/GameLogic/SCA_TimeEventManager.h

@@ -55,9 +55,7 @@ public:
 	vector<CValue*>	GetTimeValues();
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_TimeEventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_TimeEventManager")
 #endif
 };
 

source/gameengine/Ketsji/BL_Action.h

@@ -132,9 +132,7 @@ public:
 	};
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Action"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Action")
 #endif
 };
 

source/gameengine/Ketsji/BL_ActionManager.h

@@ -94,9 +94,7 @@ public:
 	void Update(float);
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ActionManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ActionManager")
 #endif
 };
 

source/gameengine/Ketsji/BL_BlenderShader.h

@@ -97,9 +97,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderShader"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_BlenderShader")
 #endif
 };
 

source/gameengine/Ketsji/BL_Material.h

@@ -110,9 +110,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Material"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Material")
 #endif
 };
 

source/gameengine/Ketsji/BL_Shader.h

@@ -32,9 +32,7 @@ public:
 	int				mLoc;		// Sampler location
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Sampler"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Sampler")
 #endif
 };
 
@@ -79,9 +77,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Uniform"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Uniform")
 #endif
 };
 
@@ -104,9 +100,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DefUniform"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_DefUniform")
 #endif
 };
 

source/gameengine/Ketsji/BL_Texture.h

@@ -74,9 +74,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Texture"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Texture")
 #endif
 };
 

source/gameengine/Ketsji/KX_BulletPhysicsController.h

@@ -92,9 +92,7 @@ public:
 
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BulletPhysicsController"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BulletPhysicsController")
 #endif
 };
 

source/gameengine/Ketsji/KX_CameraIpoSGController.h

@@ -90,9 +90,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_CameraIpoSGController"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_CameraIpoSGController")
 #endif
 };
 

source/gameengine/Ketsji/KX_ClientObjectInfo.h

@@ -80,9 +80,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ClientObjectInfo"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ClientObjectInfo")
 #endif
 };
 

source/gameengine/Ketsji/KX_Dome.h

@@ -191,9 +191,7 @@ protected:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_Dome"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_Dome")
 #endif
 };
 

source/gameengine/Ketsji/KX_EmptyObject.h

@@ -43,9 +43,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_EmptyObject"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_EmptyObject")
 #endif
 };
 

source/gameengine/Ketsji/KX_FontObject.h

@@ -69,12 +69,8 @@ protected:
 
 	class RAS_IRenderTools*	m_rendertools;	//needed for drawing routine
 
-#if 0 // WHY COMMENTED? - campbell
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_FontObject"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
-#endif
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_FontObject")
 #endif
 
 #ifdef WITH_PYTHON

source/gameengine/Ketsji/KX_IInterpolator.h

@@ -46,9 +46,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IInterpolator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IInterpolator")
 #endif
 };
 

source/gameengine/Ketsji/KX_IPO_SGController.h

@@ -119,11 +119,10 @@ public:
 		m_ipotime = time;
 		m_modified = true;
 	}
-	
+
+
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IpoSGController"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IpoSGController")
 #endif
 };
 

source/gameengine/Ketsji/KX_IPhysicsController.h

@@ -141,9 +141,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IPhysicsController"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IPhysicsController")
 #endif
 };
 

source/gameengine/Ketsji/KX_IScalarInterpolator.h

@@ -44,9 +44,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IScalarInterpolator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IScalarInterpolator")
 #endif
 };
 

source/gameengine/Ketsji/KX_ISceneConverter.h

@@ -89,9 +89,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISceneConverter"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ISceneConverter")
 #endif
 };
 

source/gameengine/Ketsji/KX_ISystem.h

@@ -55,9 +55,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISystem"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ISystem")
 #endif
 };
 

source/gameengine/Ketsji/KX_KetsjiEngine.h

@@ -443,9 +443,7 @@ protected:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_KetsjiEngine"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_KetsjiEngine")
 #endif
 };
 

source/gameengine/Ketsji/KX_LightIpoSGController.h

@@ -98,9 +98,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_LightIpoSGController"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_LightIpoSGController")
 #endif
 };
 

source/gameengine/Ketsji/KX_MaterialIpoController.h

@@ -58,9 +58,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MaterialIpoController"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_MaterialIpoController")
 #endif
 };
 

source/gameengine/Ketsji/KX_MotionState.h

@@ -58,8 +58,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MotionState"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_MotionState")
 #endif
 };
 

source/gameengine/Ketsji/KX_ObColorIpoSGController.h

@@ -73,9 +73,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ObColorIpoSGController"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ObColorIpoSGController")
 #endif
 };
 

source/gameengine/Ketsji/KX_OrientationInterpolator.h

@@ -56,9 +56,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-private:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_OrientationInterpolator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_OrientationInterpolator")
 #endif
 };
 

source/gameengine/Ketsji/KX_PositionInterpolator.h

@@ -56,9 +56,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-private:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_PositionInterpolator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_PositionInterpolator")
 #endif
 };
 

source/gameengine/Ketsji/KX_RayCast.h

@@ -96,9 +96,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_RayCast")
 #endif
 };
 
@@ -135,9 +133,7 @@ public:
 	
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast::Callback"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_RayCast::Callback")
 #endif
 };
 	

source/gameengine/Ketsji/KX_RayEventManager.h

@@ -46,9 +46,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayEventManager"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_RayEventManager")
 #endif
 };
 

source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h

@@ -89,9 +89,7 @@ private :
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BoneParentRelation"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BoneParentRelation")
 #endif
 };
 

source/gameengine/Ketsji/KX_SG_NodeRelationships.h

@@ -88,9 +88,7 @@ private :
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_NormalParentRelation"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_NormalParentRelation")
 #endif
 };
 
@@ -145,9 +143,7 @@ private :
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_VertexParentRelation"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_VertexParentRelation")
 #endif
 };
 
@@ -228,9 +224,7 @@ private :
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_SlowParentRelation"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_SlowParentRelation")
 #endif
 };
 

source/gameengine/Ketsji/KX_ScalarInterpolator.h

@@ -61,9 +61,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalarInterpolator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ScalarInterpolator")
 #endif
 };
 

source/gameengine/Ketsji/KX_ScalingInterpolator.h

@@ -56,9 +56,7 @@ private:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalingInterpolator"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ScalingInterpolator")
 #endif
 };