diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2004-01-29 03:32:03 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2004-01-29 03:32:03 +0000 |
| commit | 42e84f3e5fd12bc8f1dc23d90600d40cba7f39af (patch) | |
| tree | 3896168f923d66a1edb0224bc3aed0d61dc0d8d0 /externals/grill/flext/source/flsupport.h | |
| parent | 851555a3e26e6e37908696f45223896dc86e6d1c (diff) | |
""
svn path=/trunk/; revision=1299
Diffstat (limited to 'externals/grill/flext/source/flsupport.h')
| -rw-r--r-- | externals/grill/flext/source/flsupport.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index 79122ed2..d2a8cb90 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -69,7 +69,7 @@ public: //! @} FLEXT_S_MEMORY }; - +#ifndef FLEXT_NOGLOBALNEW /************************************************************************/ // MFC doesn't like global overloading of allocators // anyway, who likes MFC @@ -90,6 +90,8 @@ 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_NOGLOBALNEW + /************************************************************************/ |