aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext/source/flsupport.h
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2003-11-29 03:41:26 +0000
committerThomas Grill <xovo@users.sourceforge.net>2003-11-29 03:41:26 +0000
commitdf40bd59509b30e24353946e89e90bbf9790cafa (patch)
treeee9ab818a080be1963a4b37ac26bda4e48088983 /externals/grill/flext/source/flsupport.h
parentc94409c4b7a90e8c16f6e5b08f1b8522b7ee71fe (diff)
""
svn path=/trunk/; revision=1201
Diffstat (limited to 'externals/grill/flext/source/flsupport.h')
-rw-r--r--externals/grill/flext/source/flsupport.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index e8328ea3..2541e243 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -54,13 +54,6 @@ public:
void operator delete[](void *blk) { operator delete(blk); }
#endif
- /*! Get a large memory block
- the normal C library function is used here
- */
- static void *NewLarge(size_t bytes) { return ::operator new(bytes); }
- //! Free a large memory block
- static void FreeLarge(void *blk) { ::operator delete(blk); }
-
//! Get an aligned memory block
static void *NewAligned(size_t bytes,int bitalign = 128);
//! Free an aligned memory block
@@ -69,11 +62,18 @@ public:
static bool IsAligned(void *ptr,int bitalign = 128) {
return (reinterpret_cast<unsigned long>(ptr)&(bitalign-1)) == 0;
}
-
//! @} FLEXT_S_MEMORY
-
};
+// define global new/delete operators
+inline void *operator new(size_t bytes) { return flext_root::operator new(bytes); }
+inline void operator delete(void *blk) { flext_root::operator delete(blk); }
+#ifndef __MRC__ // doesn't allow new[] overloading?!
+inline void *operator new[](size_t bytes) { return flext_root::operator new[](bytes); }
+inline void operator delete[](void *blk) { flext_root::operator delete[](blk); }
+#endif
+
+
class FLEXT_SHARE FLEXT_CLASSDEF(flext);
typedef class FLEXT_CLASSDEF(flext) flext;