From 42e84f3e5fd12bc8f1dc23d90600d40cba7f39af Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Thu, 29 Jan 2004 03:32:03 +0000 Subject: "" svn path=/trunk/; revision=1299 --- externals/grill/flext/source/flsupport.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'externals/grill/flext/source/flsupport.h') 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 + /************************************************************************/ -- cgit v1.2.1