Skip to content
Snippets Groups Projects
Commit e8aa0c49 authored by Richard Linden's avatar Richard Linden
Browse files

BUILDFIX: some gcc build fixes

parent 5762c1d0
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
indra/llcommon/llframetimer.h
+ 1
− 1
View file @ e8aa0c49
...@@ -52,7 +52,7 @@ class LL_COMMON_API LLFrameTimer ...@@ -52,7 +52,7 @@ class LL_COMMON_API LLFrameTimer
// Return a low precision usec since epoch // Return a low precision usec since epoch
static U64 getTotalTime() static U64 getTotalTime()
{ {
return sTotalTime ? sTotalTime : totalTime(); return sTotalTime ? LLUnitImplicit<U64, LLUnits::Microseconds>(sTotalTime) : totalTime();
} }
// Return a low precision seconds since epoch // Return a low precision seconds since epoch
......
indra/llcommon/llrefcount.h
+ 1
− 1
View file @ e8aa0c49
indra/llcommon/lltimer.cpp
+ 0
− 2
View file @ e8aa0c49
...@@ -203,8 +203,6 @@ F64 calc_clock_frequency(unsigned int uiMeasureMSecs) ...@@ -203,8 +203,6 @@ F64 calc_clock_frequency(unsigned int uiMeasureMSecs)
return 1000000.0; // microseconds, so 1 MHz. return 1000000.0; // microseconds, so 1 MHz.
} }
const U64 SEC_TO_MICROSEC_U64 = 1000000;
U64 get_clock_count() U64 get_clock_count()
{ {
// Linux clocks are in microseconds // Linux clocks are in microseconds
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment