[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33536] trunk/blender/intern/ghost: Added WITH_CXX_GUARDEDALLOC support for GHOST, disabled by default.

[Campbell Barton]

Revision: 33536
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33536
Author:   campbellbarton
Date:     2010-12-07 12:57:34 +0100 (Tue, 07 Dec 2010)

Log Message:
-----------
Added WITH_CXX_GUARDEDALLOC support for GHOST, disabled by default.

Modified Paths:
--------------
    trunk/blender/intern/ghost/GHOST_IEvent.h
    trunk/blender/intern/ghost/GHOST_IEventConsumer.h
    trunk/blender/intern/ghost/GHOST_ISystem.h
    trunk/blender/intern/ghost/GHOST_ITimerTask.h
    trunk/blender/intern/ghost/GHOST_IWindow.h
    trunk/blender/intern/ghost/GHOST_Rect.h
    trunk/blender/intern/ghost/GHOST_Types.h
    trunk/blender/intern/ghost/intern/GHOST_WindowManager.h

Modified: trunk/blender/intern/ghost/GHOST_IEvent.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_IEvent.h	2010-12-07 11:03:53 UTC (rev 33535)
+++ trunk/blender/intern/ghost/GHOST_IEvent.h	2010-12-07 11:57:34 UTC (rev 33536)
@@ -83,6 +83,12 @@
 	 * @return The event data.
 	 */
 	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); }
+#endif
 };
 
 #endif // _GHOST_IEVENT_H_

Modified: trunk/blender/intern/ghost/GHOST_IEventConsumer.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_IEventConsumer.h	2010-12-07 11:03:53 UTC (rev 33535)
+++ trunk/blender/intern/ghost/GHOST_IEventConsumer.h	2010-12-07 11:57:34 UTC (rev 33536)
@@ -62,6 +62,12 @@
 	 * @return	Indication as to whether the event was handled.
 	 */
 	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); }
+#endif
 };
 
 #endif // _GHOST_EVENT_CONSUMER_H_

Modified: trunk/blender/intern/ghost/GHOST_ISystem.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_ISystem.h	2010-12-07 11:03:53 UTC (rev 33535)
+++ trunk/blender/intern/ghost/GHOST_ISystem.h	2010-12-07 11:57:34 UTC (rev 33536)
@@ -404,6 +404,12 @@
 
 	/** The one and only system */
 	static GHOST_ISystem* m_system;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_ISystem"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // _GHOST_ISYSTEM_H_

Modified: trunk/blender/intern/ghost/GHOST_ITimerTask.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_ITimerTask.h	2010-12-07 11:03:53 UTC (rev 33535)
+++ trunk/blender/intern/ghost/GHOST_ITimerTask.h	2010-12-07 11:57:34 UTC (rev 33536)
@@ -83,6 +83,12 @@
 	 * @param data The timer user data.
 	 */
 	virtual void setUserData(const GHOST_TUserDataPtr userData) = 0;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_ITimerTask"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 #endif // _GHOST_ITIMER_TASK_H_

Modified: trunk/blender/intern/ghost/GHOST_IWindow.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_IWindow.h	2010-12-07 11:03:53 UTC (rev 33535)
+++ trunk/blender/intern/ghost/GHOST_IWindow.h	2010-12-07 11:57:34 UTC (rev 33536)
@@ -305,6 +305,11 @@
 	 */
 	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); }
+#endif
 };
 
 #endif // _GHOST_IWINDOW_H_

Modified: trunk/blender/intern/ghost/GHOST_Rect.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Rect.h	2010-12-07 11:03:53 UTC (rev 33535)
+++ trunk/blender/intern/ghost/GHOST_Rect.h	2010-12-07 11:57:34 UTC (rev 33536)
@@ -185,6 +185,12 @@
 	GHOST_TInt32 m_r;
 	/** Bottom coordinate of the rectangle */
 	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); }
+#endif
 };
 
 

Modified: trunk/blender/intern/ghost/GHOST_Types.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Types.h	2010-12-07 11:03:53 UTC (rev 33535)
+++ trunk/blender/intern/ghost/GHOST_Types.h	2010-12-07 11:57:34 UTC (rev 33536)
@@ -29,6 +29,10 @@
 #ifndef _GHOST_TYPES_H_
 #define _GHOST_TYPES_H_
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 typedef	char				GHOST_TInt8;
 typedef	unsigned char		GHOST_TUns8;
 typedef short				GHOST_TInt16;

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowManager.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowManager.h	2010-12-07 11:03:53 UTC (rev 33535)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowManager.h	2010-12-07 11:57:34 UTC (rev 33536)
@@ -160,6 +160,13 @@
 
 	/** Window that was active before entering fullscreen state. */
 	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); }
+#endif
+	
 };
 
 #endif // _GHOST_WINDOW_MANAGER_H_