From 216da4973fc523fc207d5d0f5986da227e7e6665 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Wed, 6 Jul 2005 16:08:20 +0000 Subject: changed initialization functions accordingly FIFO code with mutex lock c++ conformance fix fixes for Codewarrior updates for OSX extracted maps into flmap.h fix for BCC made flext::Forward threadsafe don't install build system yet digest one-element list messages as single atoms updated tutorials fixes for MSVC6 documentation slimmed object data structures simplified message analysis corrected flext version to 0.4.5 added X86-64 code for lockfree fifos preparation of release upgraded version number svn path=/trunk/; revision=3292 --- externals/grill/flext/source/flsupport.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (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 9d91ee9c..a439b47b 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -53,8 +53,10 @@ public: //! Overloaded delete method void operator delete(void *blk); +#ifndef __BORLANDC__ inline void *operator new(size_t,void *p) { return p; } inline void operator delete(void *,void *) {} +#endif #ifdef FLEXT_DEBUGMEM static bool MemCheck(void *blk); @@ -62,13 +64,15 @@ public: static bool MemCheck(void *) { return true; } #endif - #ifndef __MRC__ // doesn't allow new[] overloading?! +#ifndef __MRC__ // doesn't allow new[] overloading?! inline void *operator new[](size_t bytes) { return operator new(bytes); } inline void operator delete[](void *blk) { operator delete(blk); } +#ifndef __BORLANDC__ inline void *operator new[](size_t,void *p) { return p; } inline void operator delete[](void *,void *) {} - #endif +#endif +#endif //! Get an aligned memory block static void *NewAligned(size_t bytes,int bitalign = 128); -- cgit v1.2.1