i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partial fix for DEBUG=1 build on a 64bit host

Browse Source 
Signed-off-by: Matt Madia <[email protected]>
This commit is contained in:
Urias McCullough
2011-12-21 17:21:38 +00:00
committed by Matt Madia
parent 5693bf2fa9
commit 4ad0585ebc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/support/BlockCache.cpp
+4 -4
View File
@@ -83,7 +83,7 @@ BBlockCache::BBlockCache(uint32 blockCount,
block->next = fFreeList; block->next = fFreeList;
fFreeList = block; fFreeList = block;
DEBUG_ONLY(block->magic1 = MAGIC1); DEBUG_ONLY(block->magic1 = MAGIC1);
DEBUG_ONLY(block->magic2 = MAGIC2 + (uint32)block->next); DEBUG_ONLY(block->magic2 = MAGIC2 + (uint32)(addr_t)block->next);
} }
} }
@@ -93,7 +93,7 @@ BBlockCache::~BBlockCache()
fLocker.Lock(); fLocker.Lock();
while (fFreeList) { while (fFreeList) {
ASSERT(fFreeList->magic1 == MAGIC1); ASSERT(fFreeList->magic1 == MAGIC1);
ASSERT(fFreeList->magic2 == MAGIC2 + (uint32)fFreeList->next); ASSERT(fFreeList->magic2 == MAGIC2 + (uint32)(addr_t)fFreeList->next);
void *pointer = fFreeList; void *pointer = fFreeList;
fFreeList = fFreeList->next; fFreeList = fFreeList->next;
DEBUG_ONLY(memset(pointer, 0xCC, sizeof(_FreeBlock))); DEBUG_ONLY(memset(pointer, 0xCC, sizeof(_FreeBlock)));
@@ -111,7 +111,7 @@ BBlockCache::Get(size_t blockSize)
if (blockSize == fBlockSize && fFreeList != 0) { if (blockSize == fBlockSize && fFreeList != 0) {
// we can take a block from the list // we can take a block from the list
ASSERT(fFreeList->magic1 == MAGIC1); ASSERT(fFreeList->magic1 == MAGIC1);
ASSERT(fFreeList->magic2 == MAGIC2 + (uint32)fFreeList->next); ASSERT(fFreeList->magic2 == MAGIC2 + (uint32)(addr_t)fFreeList->next);
pointer = fFreeList; pointer = fFreeList;
fFreeList = fFreeList->next; fFreeList = fFreeList->next;
fFreeBlocks--; fFreeBlocks--;
@@ -138,7 +138,7 @@ BBlockCache::Save(void *pointer, size_t blockSize)
fFreeList = block; fFreeList = block;
fFreeBlocks++; fFreeBlocks++;
DEBUG_ONLY(block->magic1 = MAGIC1); DEBUG_ONLY(block->magic1 = MAGIC1);
DEBUG_ONLY(block->magic2 = MAGIC2 + (uint32)block->next); DEBUG_ONLY(block->magic2 = MAGIC2 + (uint32)(addr_t)block->next);
} else { } else {
DEBUG_ONLY(memset(pointer, 0xCC, sizeof(_FreeBlock))); DEBUG_ONLY(memset(pointer, 0xCC, sizeof(_FreeBlock)));
fFree(pointer); fFree(pointer);