diff options
| -rw-r--r-- | indra/llcommon/llmemory.cpp | 8 | ||||
| -rw-r--r-- | indra/llimage/llimage.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 6ac0ef847d..a931cd62ba 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -572,7 +572,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 ; @@ -1311,7 +1311,7 @@ char* LLPrivateMemoryPool::allocate(U32 size) LLMemoryChunk* chunk = mChunkList[chunk_idx]; while(chunk) { - if(p = chunk->allocate(size)) + if((p = chunk->allocate(size))) { break ; } @@ -1326,7 +1326,7 @@ char* LLPrivateMemoryPool::allocate(U32 size) chunk = mChunkList[chunk_idx]; while(chunk) { - if(p = chunk->allocate(size)) + if((p = chunk->allocate(size))) { break ; } @@ -1359,7 +1359,7 @@ void LLPrivateMemoryPool::free(void* addr) if(!chunk) { - delete[] addr ; //release from heap + delete[] (char*)addr ; //release from heap } else { diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index aa01df2be8..7ee026699b 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -146,7 +146,7 @@ void LLImageBase::deleteMemory(void* p) } else { - delete[] p ; + delete[] (char*)p ; } } diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 89251d2d37..8f0f025e4c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1027,7 +1027,7 @@ void LLAppViewer::initMaxHeapSize() void LLAppViewer::checkMemory() { const static F32 MEMORY_CHECK_INTERVAL = 1.0f ; //second - const static F32 MAX_QUIT_WAIT_TIME = 30.0f ; //seconds + //const static F32 MAX_QUIT_WAIT_TIME = 30.0f ; //seconds const static U32 MAX_SIZE_CHECKED_MEMORY_BLOCK = 64 * 1024 * 1024 ; //64 MB //static F32 force_quit_timer = MAX_QUIT_WAIT_TIME + MEMORY_CHECK_INTERVAL ; static void* last_reserved_address = NULL ; |