diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 14:35:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-25 14:35:24 +0400 |
| commit | 3c8a4c458bc66cfe54e83c00f2d4460a52e04535 (patch) | |
| tree | 151c0fa579ac0fcdc7230e8224bfdaf3c3c2ed87 /intern/ghost/GHOST_Types.h | |
| parent | cc0784c1b9c4d813837dedddd5b2b4c52fe291f0 (diff) | |
more guardedalloc use in C++, also make compositorMutex a static var, was allocated and never freed.
Diffstat (limited to 'intern/ghost/GHOST_Types.h')
| -rw-r--r-- | intern/ghost/GHOST_Types.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 8454f338645..4921acde670 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -37,7 +37,11 @@ #include "MEM_guardedalloc.h" #endif -#define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name +#if defined(WITH_CXX_GUARDEDALLOC) && defined(__cplusplus) +# define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; MEM_CXX_CLASS_ALLOC_FUNCS(#name) } *name +#else +# define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name +#endif typedef char GHOST_TInt8; typedef unsigned char GHOST_TUns8; |