livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUILDFIX: some gcc build fixes

master
Richard Linden 2013-07-30 19:50:37 -07:00
parent 5762c1d0d7
commit e8aa0c493b
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llframetimer.h
View File

@ -52,7 +52,7 @@ public:
// Return a low precision usec since epoch
static U64 getTotalTime()
{
return sTotalTime ? sTotalTime : totalTime();
return sTotalTime ? LLUnitImplicit<U64, LLUnits::Microseconds>(sTotalTime) : totalTime();
}
// Return a low precision seconds since epoch

2
indra/llcommon/llrefcount.h
View File

@ -62,7 +62,7 @@ public:
inline S32 unref() const
{
llassert(mRef >= 1);
if (0 == --mRef)
if (0 == --mRef)
{
delete this;
return 0;

2
indra/llcommon/lltimer.cpp
View File

@ -203,8 +203,6 @@ F64 calc_clock_frequency(unsigned int uiMeasureMSecs)
return 1000000.0; // microseconds, so 1 MHz.
}
const U64 SEC_TO_MICROSEC_U64 = 1000000;
U64 get_clock_count()
{
// Linux clocks are in microseconds