diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2005-02-12 04:56:09 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2005-02-12 04:56:09 +0000 |
| commit | 3d2c0b82fb2192cc3295dd0f64b09163db6b63ef (patch) | |
| tree | 29352122c1a9c2ecff276cc26e13366d31e78cf1 /externals/grill/flext/source/flsupport.h | |
| parent | 771bef794b7edb7ef6cbe78acf2ee93b39f10f74 (diff) | |
Max: use high-priority click instead of qelem for message-posting
fixed flext::Timer::At method
eliminated ChannelsIn/ChannelsOut
fix for flext_dsp @ Max
better STL support on OSX
svn path=/trunk/; revision=2567
Diffstat (limited to 'externals/grill/flext/source/flsupport.h')
| -rw-r--r-- | externals/grill/flext/source/flsupport.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index 95bf8ea6..9377b021 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -53,9 +53,15 @@ public: //! Overloaded delete method void operator delete(void *blk); + inline void *operator new(size_t,void *p) { return p; } + inline void operator delete(void *,void *) {} + #ifndef __MRC__ // doesn't allow new[] overloading?! - void *operator new[](size_t bytes) { return operator new(bytes); } - void operator delete[](void *blk) { operator delete(blk); } + inline void *operator new[](size_t bytes) { return operator new(bytes); } + inline void operator delete[](void *blk) { operator delete(blk); } + + inline void *operator new[](size_t,void *p) { return p; } + inline void operator delete[](void *,void *) {} #endif //! Get an aligned memory block |