diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-12 07:51:14 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-12 07:51:14 -0800 |
| commit | bcb5b209d1813681202524362dd186c8b0982357 (patch) | |
| tree | e2d8c8c6448f2476123fd8e590665f7f20fe1a20 /indra/llcommon/llmemory.cpp | |
| parent | 7daa3d1ca10199468946feef0ce8eb67489deee0 (diff) | |
trivial: fix some mac compiling errors
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
| -rw-r--r-- | indra/llcommon/llmemory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 543f17baf4..875ff9971c 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -398,7 +398,7 @@ void LLPrivateMemoryPool::LLMemoryBlock::init(char* buffer, U32 buffer_size, U32 mSlotSize = slot_size ; mTotalSlots = buffer_size / mSlotSize ; - llassert_always(mTotalSlots < 256) ; //max number is 256 + llassert_always(buffer_size / mSlotSize < 256) ; //max number is 256 mAllocatedSlots = 0 ; @@ -1137,7 +1137,7 @@ char* LLPrivateMemoryPool::allocate(U32 size) LLMemoryChunk* chunk = mChunkList[chunk_idx]; while(chunk) { - if(p = chunk->allocate(size)) + if((p = chunk->allocate(size))) { break ; } @@ -1152,7 +1152,7 @@ char* LLPrivateMemoryPool::allocate(U32 size) chunk = mChunkList[chunk_idx]; while(chunk) { - if(p = chunk->allocate(size)) + if((p = chunk->allocate(size))) { break ; } @@ -1185,7 +1185,7 @@ void LLPrivateMemoryPool::free(void* addr) if(!chunk) { - delete[] addr ; //release from heap + delete[] (char*)addr ; //release from heap } else { |