diff options
| author | Richard Linden <none@none> | 2012-12-07 15:20:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-07 15:20:12 -0800 |
| commit | c99886d94389babc78e92bbfa5084fdd785915af (patch) | |
| tree | 839ffe3031ca296182743cf7af4d7375e2fb3c78 /indra/llcommon/llfasttimer.cpp | |
| parent | 3745d1254acc386acaadd20016123c9a47b8d10c (diff) | |
SH-3406 WIP convert fast timers to lltrace system
improved unit tests for LLUnit
renamed LLUnit to LLUnitImplicit with LLUnit being reserved for
explicit units
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index cf7655acf7..37e0fbac0a 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -166,7 +166,7 @@ U64 TimeBlock::countsPerSecond() // counts per second for the *64-bit* timer firstcall = false; } #endif - return sCPUClockFrequency; + return sCPUClockFrequency.value(); } #endif @@ -408,7 +408,7 @@ void TimeBlock::nextFrame() } call_count++; - LLUnit<LLUnits::Seconds, F64> total_time = 0; + LLUnit<LLUnits::Seconds, F64> total_time(0); LLSD sd; { @@ -479,7 +479,7 @@ void TimeBlock::dumpCurTimes() } out_str << timerp->getName() << " " - << std::setprecision(3) << total_time_ms.as<LLUnits::Milliseconds, F32>() << " ms, " + << std::setprecision(3) << total_time_ms.as<LLUnits::Milliseconds, F32>().value() << " ms, " << num_calls << " calls"; llinfos << out_str.str() << llendl; |