From ca73cb435a281fd992fe83fd30157d0d8b488562 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 30 Jan 2018 22:27:27 +0300 Subject: [PATCH] firebird-c++14.patch --- .../firebird/files/firebird-c++14.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 server/database/firebird/files/firebird-c++14.patch diff --git a/server/database/firebird/files/firebird-c++14.patch b/server/database/firebird/files/firebird-c++14.patch new file mode 100644 index 0000000000..f846af2a91 --- /dev/null +++ b/server/database/firebird/files/firebird-c++14.patch @@ -0,0 +1,32 @@ +diff -Nuar a/src/common/classes/alloc.cpp b/src/common/classes/alloc.cpp +--- a/src/common/classes/alloc.cpp 2017-02-14 12:17:16.000000000 +0300 ++++ b/src/common/classes/alloc.cpp 2018-01-30 20:53:56.618391768 +0300 +@@ -2141,3 +2141,11 @@ + { + Firebird::MemoryPool::globalFree(mem); + } ++void operator delete(void* mem, size_t) throw() ++{ ++ Firebird::MemoryPool::globalFree(mem); ++} ++void operator delete[](void* mem, size_t) throw() ++{ ++ Firebird::MemoryPool::globalFree(mem); ++} +diff -Nuar a/src/common/classes/alloc.h b/src/common/classes/alloc.h +--- a/src/common/classes/alloc.h 2017-02-14 12:17:16.000000000 +0300 ++++ b/src/common/classes/alloc.h 2018-01-30 20:55:04.555386866 +0300 +@@ -498,13 +498,6 @@ + + inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; } + +-// Global versions of operators new and delete +-void* operator new(size_t s) THROW_BAD_ALLOC; +-void* operator new[](size_t s) THROW_BAD_ALLOC; +- +-void operator delete(void* mem) throw(); +-void operator delete[](void* mem) throw(); +- + #ifdef DEBUG_GDS_ALLOC + inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* file, int line) + {