diff options
| author | Richard Linden <none@none> | 2013-07-30 19:50:37 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-30 19:50:37 -0700 |
| commit | e8aa0c493b66dd414ef75ddb3fb1c77875b0c42d (patch) | |
| tree | 39a2af9c7d3b356c3f10f3244da0ab0f12aa1081 | |
| parent | 5762c1d0d727f0050aefe7126ab2d5280bebfb9b (diff) | |
BUILDFIX: some gcc build fixes
| -rwxr-xr-x | indra/llcommon/llframetimer.h | 2 | ||||
| -rwxr-xr-x | indra/llcommon/llrefcount.h | 2 | ||||
| -rwxr-xr-x | indra/llcommon/lltimer.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h index 7f61861072..d64009440c 100755 --- a/indra/llcommon/llframetimer.h +++ b/indra/llcommon/llframetimer.h @@ -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 diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h index 3e472d0766..3d59e48f74 100755 --- a/indra/llcommon/llrefcount.h +++ b/indra/llcommon/llrefcount.h @@ -62,7 +62,7 @@ public: inline S32 unref() const { llassert(mRef >= 1); - if (0 == --mRef) + if (0 == --mRef) { delete this; return 0; diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index 8f5a886a37..f27c433ee1 100755 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -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 |