From 90b5937c74f6712dfee1e90568d174a1aaca5ed7 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 10 Jan 2013 04:19:16 +0000 Subject: gcc fixes --- indra/newview/llfasttimerview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 56e5710726..6409767285 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -514,7 +514,7 @@ void LLFastTimerView::draw() else { ms = LLUnit(frame_recording.getPeriodMean(*idp)); - calls = frame_recording.getPeriodMean(idp->callCount()); + calls = frame_recording.getPeriodMean((F32)idp->callCount()); } if (mDisplayCalls) @@ -736,7 +736,7 @@ void LLFastTimerView::draw() { sublevelticks += (tidx == -1) ? frame_recording.getPeriodMean(**it).value() - : frame_recording.getPrevRecordingPeriod(tidx).getSum(**it).value(); + : (U64)frame_recording.getPrevRecordingPeriod(tidx).getSum(**it).value(); } F32 subfrac = (F32)sublevelticks / (F32)total_time.value(); @@ -934,7 +934,7 @@ void LLFastTimerView::draw() max_time = llmax(LLUnit(1), LLUnit(cur_max)); } - max_calls = lerp((F32)max_calls, (F32) cur_max_calls, LLCriticalDamp::getInterpolant(0.1f)); + max_calls = llround(lerp((F32)max_calls, (F32) cur_max_calls, LLCriticalDamp::getInterpolant(0.1f))); if (llabs((S32)(max_calls - cur_max_calls)) <= 1) { max_calls = cur_max_calls; @@ -1011,7 +1011,7 @@ void LLFastTimerView::draw() } LLUnit ms = ticks; - timer_stat += llformat("%.1f",ms); + timer_stat += llformat("%.1f",ms.value()); if (idp->getCollapsed()) { -- cgit v1.2.3