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

Fixed return type - thanks to Vlad

Browse Source
This commit is contained in:
alexpeshkoff 2015-10-08 08:52:51 +00:00
parent 252413eae7
commit 3994de35ec
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1519,10 +1519,10 @@ private:
virtual void memoryIsExhausted(void) throw (OOM_EXCEPTION);
void* allocRaw(size_t length) throw (OOM_EXCEPTION);
static void release(void* block) throw ();
static size_t releaseRaw(bool destroying, void *block, size_t size, bool use_cache = true) throw ();
static void releaseRaw(bool destroying, void *block, size_t size, bool use_cache = true) throw ();
public:
static size_t releaseExtent(bool destroying, void *block, size_t size, bool use_cache = true) throw ();
static void releaseExtent(bool destroying, void *block, size_t size, bool use_cache = true) throw ();
// pass desired size, return actual extent size
template <class Extent>
@ -2140,7 +2140,7 @@ void* MemPool::getExtent(size_t& size) throw(OOM_EXCEPTION) // pass desired min
}
size_t MemPool::releaseExtent(bool destroying, void* block, size_t size, bool use_cache) throw ()
void MemPool::releaseExtent(bool destroying, void* block, size_t size, bool use_cache) throw ()
{
if (size == PARENT_EXTENT_SIZE)
deallocate(block);
@ -2149,7 +2149,7 @@ size_t MemPool::releaseExtent(bool destroying, void* block, size_t size, bool us
}
size_t MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_cache) throw ()
void MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_cache) throw ()
{
#ifndef USE_VALGRIND
if (use_cache && (size == DEFAULT_ALLOCATION))
@ -2158,7 +2158,7 @@ size_t MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_c
if (extents_cache.getCount() < extents_cache.getCapacity())
{
extents_cache.push(block);
return size;
return;
}
}
#else
@ -2185,7 +2185,7 @@ size_t MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_c
item->size = size;
item->handle = handle;
delayedExtentCount++;
return size;
return;
}
DelayedExtent* item = &delayedExtents[delayedExtentsPos];
@ -2225,8 +2225,6 @@ size_t MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_c
#endif
#endif // WIN_NT
corrupt("OS memory deallocation error");
return size;
}
void MemPool::globalFree(void* block) throw ()