firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 04:03:04 +01:00
Code Issues

Fix warnings when DEBUG_GDS_ALLOC is defined

Browse Source
This commit is contained in:
hvlad 2020-02-13 16:24:11 +02:00
parent 8d32de94be
commit 8f5d66d1b3
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/classes/alloc.cpp
View File

@ -2963,4 +2963,15 @@ void* operator new[](size_t s) FB_THROW (OOM_EXCEPTION)
{
return MemoryPool::globalAlloc(s ALLOC_ARGS);
}
void operator delete(void* mem) FB_NOTHROW
{
MemoryPool::globalFree(mem);
}
void operator delete[](void* mem) FB_NOTHROW
{
MemoryPool::globalFree(mem);
}
#endif // DEBUG_GDS_ALLOC

19
src/common/classes/alloc.h
View File

@ -396,23 +396,8 @@ inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) FB_NOTHROW
#ifdef DEBUG_GDS_ALLOC
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Winline-new-delete"
#endif
inline void operator delete(void* mem) FB_NOTHROW
{
MemoryPool::globalFree(mem);
}
inline void operator delete[](void* mem) FB_NOTHROW
{
MemoryPool::globalFree(mem);
}
#ifdef __clang__
#pragma clang diagnostic pop
#endif
extern void operator delete(void* mem) FB_NOTHROW;
extern void operator delete[](void* mem) FB_NOTHROW;
#endif // DEBUG_GDS_ALLOC