diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-27 20:50:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-28 20:23:50 +0000 |
| commit | 5ab4233169de4af33edfccd3c287436b58157414 (patch) | |
| tree | e076b24d9eca60662016239c447a13a48fed8a57 /external | |
| parent | 486c91147c587febdacf3fa95d56633dbd703d5f (diff) | |
make firebird build on gcc 6 again
Change-Id: Ie9bf5003dd5ed2698c2bde58fd6767f3852adeae
Reviewed-on: https://gerrit.libreoffice.org/22738
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/firebird-c++14.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/external/firebird/firebird-c++14.patch b/external/firebird/firebird-c++14.patch index ad095bf6793e..d978cef23b86 100644 --- a/external/firebird/firebird-c++14.patch +++ b/external/firebird/firebird-c++14.patch @@ -12,3 +12,19 @@ +{ + Firebird::MemoryPool::globalFree(mem); +} +--- src/common/classes/alloc.h ++++ src/common/classes/alloc.h +@@ -491,13 +491,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) + { |