[Libreoffice-commits] core.git: external/firebird

[Caolán McNamara]

 external/firebird/firebird-c++14.patch |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

New commits:
commit 5ab4233169de4af33edfccd3c287436b58157414
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 27 20:50:42 2016 +0000

    make firebird build on gcc 6 again
    
    Change-Id: Ie9bf5003dd5ed2698c2bde58fd6767f3852adeae
    Reviewed-on: https://gerrit.libreoffice.org/22738
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/firebird/firebird-c++14.patch b/external/firebird/firebird-c++14.patch
index ad095bf..d978cef 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)
+ {