mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 22:03:04 +01:00
Warnings.
This commit is contained in:
parent
36141fbf69
commit
4262ee12fc
@ -180,15 +180,16 @@ class pool_alloc_rpt : public TypedHandle<BLOCK_TYPE>
|
|||||||
public:
|
public:
|
||||||
typedef RPT blk_repeat_type;
|
typedef RPT blk_repeat_type;
|
||||||
#ifdef DEBUG_GDS_ALLOC
|
#ifdef DEBUG_GDS_ALLOC
|
||||||
void* operator new(size_t s, MemoryPool& p, int rpt, const char* file, int line)
|
void* operator new(size_t s, MemoryPool& p, size_t rpt, const char* file, int line)
|
||||||
{ return p.calloc(s + sizeof(RPT) * rpt, file, line); }
|
{ return p.calloc(s + sizeof(RPT) * rpt, file, line); }
|
||||||
#else
|
#else
|
||||||
void* operator new(size_t s, MemoryPool& p, int rpt)
|
void* operator new(size_t s, MemoryPool& p, size_t rpt)
|
||||||
{ return p.calloc(s + sizeof(RPT) * rpt); }
|
{ return p.calloc(s + sizeof(RPT) * rpt); }
|
||||||
#endif
|
#endif
|
||||||
void operator delete(void* mem, MemoryPool& p, int /*rpt*/)
|
void operator delete(void* mem, MemoryPool& p)
|
||||||
{ if (mem) p.deallocate(mem); }
|
{ if (mem) p.deallocate(mem); }
|
||||||
void operator delete(void* mem) { if (mem) MemoryPool::globalFree(mem); }
|
void operator delete(void* mem)
|
||||||
|
{ if (mem) MemoryPool::globalFree(mem); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// These operations are not supported on static repeat-base objects
|
// These operations are not supported on static repeat-base objects
|
||||||
@ -196,7 +197,8 @@ class pool_alloc_rpt : public TypedHandle<BLOCK_TYPE>
|
|||||||
{ return 0; }
|
{ return 0; }
|
||||||
void operator delete[](void* mem, MemoryPool& p)
|
void operator delete[](void* mem, MemoryPool& p)
|
||||||
{ }
|
{ }
|
||||||
void operator delete[](void* mem) { }
|
void operator delete[](void* mem)
|
||||||
|
{ }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/* These operators are off-limits */
|
/* These operators are off-limits */
|
||||||
|
Loading…
Reference in New Issue
Block a user