33 lines
885 B
Diff
33 lines
885 B
Diff
|
# Author: Adriano dos Santos Fernandes
|
||
|
|
#Index: src/common/classes/alloc.h
|
||
|
|
#===================================================================
|
||
|
|
#RCS file: /cvsroot/firebird/firebird2/src/common/classes/alloc.h,v
|
||
|
|
#retrieving revision 1.71
|
||
|
|
diff -u -p -r1.71 alloc.h
|
||
|
|
--- src/common/classes/alloc.h 26 Sep 2007 17:48:20 -0000 1.71
|
||
|
|
+++ src/common/classes/alloc.h 20 May 2009 02:20:08 -0000
|
||
|
|
@@ -47,6 +47,7 @@
|
||
|
|
#include <stdlib.h> /* XPG: prototypes for malloc/free have to be in
|
||
|
|
stdlib.h (EKU) */
|
||
|
|
#endif
|
||
|
|
+#include <new>
|
||
|
|
|
||
|
|
#ifdef _MSC_VER
|
||
|
|
#define THROW_BAD_ALLOC
|
||
|
|
@@ -448,15 +449,6 @@ inline void* operator new[](size_t s) TH
|
||
|
|
);
|
||
|
|
}
|
||
|
|
|
||
|
|
-inline void* operator new(size_t, void* ptr) throw()
|
||
|
|
-{
|
||
|
|
- return ptr;
|
||
|
|
-}
|
||
|
|
-inline void* operator new[](size_t, void* ptr) throw()
|
||
|
|
-{
|
||
|
|
- return ptr;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
inline void operator delete(void* mem) throw()
|
||
|
|
{
|
||
|
|
Firebird::MemoryPool::globalFree(mem);
|