mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some typedefs are no longer in F_FixedAlloc class.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@615 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
dsandersoremutah
2006-06-27 16:03:03 +00:00
parent 5f91337220
commit c843dd7fb7
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ftk/src/ftkmem.cpp
View File

@@ -3240,7 +3240,7 @@ Exit:
/****************************************************************************
Desc: Grabs another slab of memory from the operating system
****************************************************************************/
F_FixedAlloc::SLAB * F_FixedAlloc::getAnotherSlab( void)
SLAB * F_FixedAlloc::getAnotherSlab( void)
{
SLAB * pSlab = NULL;
@@ -4411,15 +4411,14 @@ Desc:
IF_FixedAlloc * F_MultiAlloc::getAllocator(
FLMBYTE * pucBuffer)
{
F_FixedAlloc::CELLHEADER * pHeader;
F_FixedAlloc::SLAB * pSlab;
IF_FixedAlloc * pAllocator = NULL;
CELLHEADER * pHeader;
SLAB * pSlab;
IF_FixedAlloc * pAllocator = NULL;
m_pSlabManager->lockMutex();
pHeader = (F_FixedAlloc::CELLHEADER *)(pucBuffer -
F_FixedAlloc::getAllocAlignedSize(
sizeof( F_FixedAlloc::CELLHEADER2)));
pHeader = (CELLHEADER *)(pucBuffer -
F_FixedAlloc::getAllocAlignedSize( sizeof( CELLHEADER2)));
pSlab = pHeader->pContainingSlab;
pAllocator = (IF_FixedAlloc *)pSlab->pvAllocator;