diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2013-01-11 01:52:09 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2013-01-11 01:52:09 +0000 |
| commit | d89d9cd10ff1fbe6f1f86f0b282075e775ed1b51 (patch) | |
| tree | 6abb5c7f796b2b2c12c5b6817ae01fce64e525ee | |
| parent | 7b0762984a4c49595445ed3a5a113c3f0aa17181 (diff) | |
gcc fixes
| -rw-r--r-- | indra/llcommon/lltrace.h | 3 | ||||
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index 7694f65441..ab4ad59e3d 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -680,7 +680,8 @@ void* allocAligned(size_t size) #elif LL_DARWIN padded_allocation = ll_aligned_malloc(size_with_reserve, ALIGNMENT); #else - posix_memalign(&padded_allocation, ALIGNMENT, size_with_reserve); + if (LL_UNLIKELY(0 != posix_memalign(&padded_allocation, 16, size))) + padded_allocation = NULL; #endif } return (char*)padded_allocation + aligned_reserve; diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 32ed662548..ba298ed819 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -514,7 +514,7 @@ void LLFastTimerView::draw() else { ms = LLUnit<LLUnits::Seconds, F64>(frame_recording.getPeriodMean(*idp)); - calls = (S32)frame_recording.getPeriodMean((F32)idp->callCount()); + calls = (S32)frame_recording.getPeriodMean(idp->callCount()); } if (mDisplayCalls) |