]>
Commit | Line | Data |
---|---|---|
8f47d69b AM |
1 | From: Michal Kubecek <mkubecek@suse.cz> |
2 | Date: Mon, 25 Apr 2016 08:55:36 +0200 | |
3 | Subject: Provide sized global delete operators when compiled in C++14 mode | |
4 | Patch-mainline: submitted | |
5 | Git-commit: 038f9fbf559e56032e4cb49eb7ce4c3ead23fda9 | |
6 | References: bsc#964466 CORE-5099 | |
7 | ||
8 | --- | |
9 | src/common/classes/alloc.h | 10 ++++++++++ | |
10 | 1 file changed, 10 insertions(+) | |
11 | ||
12 | diff --git a/src/common/classes/alloc.h b/src/common/classes/alloc.h | |
13 | index b1026ce2aac4..fda5bfebb0cc 100644 | |
14 | --- a/src/common/classes/alloc.h | |
15 | +++ b/src/common/classes/alloc.h | |
16 | @@ -331,6 +331,16 @@ inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS | |
17 | MemoryPool::globalFree(mem); | |
18 | } | |
19 | ||
20 | +#if __cplusplus >= 201402L | |
21 | +inline void operator delete(void* mem, std::size_t s ALLOC_PARAMS) throw() | |
22 | +{ | |
23 | + MemoryPool::globalFree(mem); | |
24 | +} | |
25 | +inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) throw() | |
26 | +{ | |
27 | + MemoryPool::globalFree(mem); | |
28 | +} | |
29 | +#endif | |
30 | #ifdef DEBUG_GDS_ALLOC | |
31 | ||
32 | #ifdef __clang__ | |
33 | -- | |
34 | 2.8.2 | |
35 | ||
36 |