diff options
Diffstat (limited to 'intern/ghost')
-rw-r--r-- | intern/ghost/GHOST_IEvent.h | 6 | ||||
-rw-r--r-- | intern/ghost/GHOST_IEventConsumer.h | 6 | ||||
-rw-r--r-- | intern/ghost/GHOST_ISystem.h | 6 | ||||
-rw-r--r-- | intern/ghost/GHOST_ITimerTask.h | 6 | ||||
-rw-r--r-- | intern/ghost/GHOST_IWindow.h | 5 | ||||
-rw-r--r-- | intern/ghost/GHOST_Rect.h | 6 | ||||
-rw-r--r-- | intern/ghost/GHOST_Types.h | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowManager.h | 7 |
8 files changed, 46 insertions, 0 deletions
diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index dae645c8943..a80407e8368 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -83,6 +83,12 @@ public: * @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_ diff --git a/intern/ghost/GHOST_IEventConsumer.h b/intern/ghost/GHOST_IEventConsumer.h index 38ad2ec424b..4d6d063fbf5 100644 --- a/intern/ghost/GHOST_IEventConsumer.h +++ b/intern/ghost/GHOST_IEventConsumer.h @@ -62,6 +62,12 @@ public: * @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_ diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 47f142e4c8a..227ba4448c3 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -404,6 +404,12 @@ protected: /** 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_ diff --git a/intern/ghost/GHOST_ITimerTask.h b/intern/ghost/GHOST_ITimerTask.h index b97ae3417c6..bb80e4670fe 100644 --- a/intern/ghost/GHOST_ITimerTask.h +++ b/intern/ghost/GHOST_ITimerTask.h @@ -83,6 +83,12 @@ public: * @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_ diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h index 83757b17e8b..2eeee621495 100644 --- a/intern/ghost/GHOST_IWindow.h +++ b/intern/ghost/GHOST_IWindow.h @@ -305,6 +305,11 @@ 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); } +#endif }; #endif // _GHOST_IWINDOW_H_ diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h index e3d056dd467..b2833eb2c28 100644 --- a/intern/ghost/GHOST_Rect.h +++ b/intern/ghost/GHOST_Rect.h @@ -185,6 +185,12 @@ public: 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 }; diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 3770bbde425..dd7b0527bf8 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -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; diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index 07f95d57ef3..06996059b82 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -160,6 +160,13 @@ protected: /** 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_ |