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

Merge pull request #18 from mkubecek/mk/4.0/gcc6

Browse Source 
mk/4.0/gcc6
This commit is contained in:
Dmitry Yemanov 2016-05-06 11:37:26 +03:00
commit a5fcb82173
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,6 +331,16 @@ inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS
MemoryPool::globalFree(mem);
}
#if __cplusplus >= 201402L
inline void operator delete(void* mem, std::size_t s ALLOC_PARAMS) throw()
{
MemoryPool::globalFree(mem);
}
inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) throw()
{
MemoryPool::globalFree(mem);
}
#endif
#ifdef DEBUG_GDS_ALLOC
#ifdef __clang__

10
src/gpre/sqe.cpp
View File

@ -1733,11 +1733,11 @@ static gpre_ctx* par_alias_list( gpre_req* request, gpre_nod* alias_list)
}
}
if (!context)
{
fb_utils::snprintf(error_string, sizeof(error_string),
"there is no alias or table named %s at this scope level",
(TEXT*) *arg);
if (!context)
{
fb_utils::snprintf(error_string, sizeof(error_string),
"there is no alias or table named %s at this scope level",
(TEXT*) *arg);
PAR_error(error_string);
}