firebird-ss/gcc-icu.diff

   1 Index: src/common/classes/alloc.h
   2 ===================================================================
   3 RCS file: /cvsroot/firebird/firebird2/src/common/classes/alloc.h,v
   4 retrieving revision 1.71
   5 diff -u -p -r1.71 alloc.h
   6 --- src/common/classes/alloc.h  26 Sep 2007 17:48:20 -0000      1.71
   7 +++ src/common/classes/alloc.h  20 May 2009 02:20:08 -0000
   8 @@ -47,6 +47,7 @@
   9  #include <stdlib.h> /* XPG: prototypes for malloc/free have to be in
  10                                            stdlib.h (EKU) */
  11  #endif
  12 +#include <new>
  13
  14  #ifdef _MSC_VER
  15  #define THROW_BAD_ALLOC
  16 @@ -448,15 +449,6 @@ inline void* operator new[](size_t s) TH
  17         );
  18  }
  19
  20 -inline void* operator new(size_t, void* ptr) throw()
  21 -{
  22 -       return ptr;
  23 -}
  24 -inline void* operator new[](size_t, void* ptr) throw()
  25 -{
  26 -       return ptr;
  27 -}
  28 -
  29  inline void operator delete(void* mem) throw()
  30  {
  31         Firebird::MemoryPool::globalFree(mem);