package/database/firebird/icu.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../firebird/icu.patch
   5 # Copyright (C) 2010 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- ./src/common/classes/alloc.h.old    2009-07-09 13:04:14.000000000 +0200
  18 +++ ./src/common/classes/alloc.h        2009-07-09 13:05:37.000000000 +0200
  19 @@ -48,6 +48,8 @@
  20                                            stdlib.h (EKU) */
  21  #endif
  22
  23 +#include <new>
  24 +
  25  #ifdef _MSC_VER
  26  #define THROW_BAD_ALLOC
  27  #else
  28 @@ -448,15 +450,6 @@
  29         );
  30  }
  31
  32 -inline void* operator new(size_t, void* ptr) throw()
  33 -{
  34 -       return ptr;
  35 -}
  36 -inline void* operator new[](size_t, void* ptr) throw()
  37 -{
  38 -       return ptr;
  39 -}
  40 -
  41  inline void operator delete(void* mem) throw()
  42  {
  43         Firebird::MemoryPool::globalFree(mem);
  44