aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2004-01-23 03:42:23 +0000
committerThomas Grill <xovo@users.sourceforge.net>2004-01-23 03:42:23 +0000
commit207ff3824e76c37ae513a8b4e53f04fd169c4334 (patch)
tree910ed23e3a72f7016fa6c6e1ad74199f84a575ef
parent02ca1075e2e6de3c47e5657354ca3796c2ec7db1 (diff)
""
svn path=/trunk/; revision=1289
-rw-r--r--externals/grill/flext/changes.txt3
-rw-r--r--externals/grill/flext/source/flsupport.h12
2 files changed, 8 insertions, 7 deletions
diff --git a/externals/grill/flext/changes.txt b/externals/grill/flext/changes.txt
index f48d4a25..113180ef 100644
--- a/externals/grill/flext/changes.txt
+++ b/externals/grill/flext/changes.txt
@@ -1,6 +1,6 @@
flext - C++ layer for Max/MSP and pd (pure data) externals
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
For information on usage and redistribution, and for a DISCLAIMER OF ALL
WARRANTIES, see the file, "license.txt," in this distribution.
@@ -15,6 +15,7 @@ Version history:
0.4.6:
- added a text edit window for list attributes
+- finally use global allocator operators (MFC doesn't like but who cares)
0.4.5:
- added some more SIMD functions
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index 3e2b6acd..79122ed2 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -2,7 +2,7 @@
flext - C++ layer for Max/MSP and pd (pure data) externals
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
For information on usage and redistribution, and for a DISCLAIMER OF ALL
WARRANTIES, see the file, "license.txt," in this distribution.
@@ -69,10 +69,10 @@ public:
//! @} FLEXT_S_MEMORY
};
-// at the moment it's a real problem that global overloading of allocators
-// clashes with MFC (e.g. in vst~)
-// therefore... try to think over it
-#if 0
+
+/************************************************************************/
+// MFC doesn't like global overloading of allocators
+// anyway, who likes MFC
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
#define NEWTHROW throw(std::bad_alloc)
@@ -90,7 +90,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
+/************************************************************************/
class FLEXT_SHARE FLEXT_CLASSDEF(flext);