livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix an issue on mac and linux, also fix an assertion.

master
Xiaohong Bao 2011-04-04 14:40:07 -06:00
parent a40ee94cd6
commit 17854c4e87
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/llmemory.cpp
View File

@ -142,7 +142,7 @@ void* LLMemory::tryToAlloc(void* address, U32 size)
}
return address ;
#else
return 0x01 ; //skip checking
return (void*)0x01 ; //skip checking
#endif
}
@ -1079,6 +1079,8 @@ LLPrivateMemoryPool::LLMemoryBlock* LLPrivateMemoryPool::LLMemoryChunk::createNe
if(new_free_blk_size > 0) //blk still has free space
{
LLMemoryBlock* next_blk = blk + (buffer_size / mMinBlockSize) ;
next_blk->mPrev = NULL ;
next_blk->mNext = NULL ;
next_blk->setBuffer(blk->getBuffer() + buffer_size, new_free_blk_size) ;
addToFreeSpace(next_blk) ;
}