diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2005-12-15 23:04:06 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-12-15 23:04:06 +0000 |
| commit | ec54f5e49b24dc57e389b7bce58f967ee69a4b01 (patch) | |
| tree | 15d495973fa6053835fd03b50e3f64dc6717815e /externals/grill/flext/source/flsupport.h | |
| parent | 90d5b8b4a064420d74678654e94ea4755b377f21 (diff) | |
new flext::CopyAtoms function
fixed dangerous spot (also memory leak) with message queuing
flext::Forward has more incarnations now
added message bundles (flext::MsgBundle)
fixes for gcc 3.3, changing FLEXT_USECMEM to FLEXT_USE_CMEMw
fixed initialization of message bundle items
svn path=/trunk/; revision=4228
Diffstat (limited to 'externals/grill/flext/source/flsupport.h')
| -rw-r--r-- | externals/grill/flext/source/flsupport.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index 2a1b7a6d..526a60af 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -47,11 +47,11 @@ public: */ #ifdef FLEXT_NOGLOBALNEW -#error FLEXT_NOGLOBALNEW is deprecated, define FLEXT_USECMEM instead -#define FLEXT_USECMEM +#error FLEXT_NOGLOBALNEW is deprecated, define FLEXT_USE_CMEM instead +#define FLEXT_USE_CMEM #endif -#ifdef FLEXT_USECMEM +#ifdef FLEXT_USE_CMEM inline void *operator new(size_t bytes) { return ::operator new(bytes); } inline void operator delete(void *blk) { ::operator delete(blk); } @@ -104,7 +104,7 @@ public: //! @} FLEXT_S_MEMORY }; -#ifndef FLEXT_USECMEM +#ifndef FLEXT_USE_CMEM /************************************************************************/ // MFC doesn't like global overloading of allocators // anyway, who likes MFC @@ -125,7 +125,7 @@ inline void *operator new[](size_t bytes) NEWTHROW { return flext_root::operator inline void operator delete[](void *blk) DELTHROW { flext_root::operator delete[](blk); } #endif -#endif // FLEXT_USECMEM +#endif // FLEXT_USE_CMEM /************************************************************************/ |