diff options
| author | Richard Linden <none@none> | 2013-01-04 15:57:28 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-04 15:57:28 -0800 |
| commit | cf8fa1a958f8676a0911bac7bdb950a865b58c83 (patch) | |
| tree | 3efbad26ac8dcbeae0ccbcc3affee4207a60f290 | |
| parent | 4ebd4b3616d9d69e9b6deb73aa1f1e16f5673225 (diff) | |
SH-3468 WIP add memory tracking base class
further compile error fixes
| -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 ad8cf7296e..e6233a094e 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -137,12 +137,12 @@ void TimeBlock::setLogLock(LLMutex* lock) //static #if (LL_DARWIN || LL_LINUX || LL_SOLARIS) && !(defined(__i386__) || defined(__amd64__)) -U64 TimeBlock::countsPerSecond() // counts per second for the *64-bit* timer +U64 TimeBlock::countsPerSecond() { return sClockResolution; } #else // windows or x86-mac or x86-linux or x86-solaris -U64 TimeBlock::countsPerSecond() // counts per second for the *64-bit* timer +U64 TimeBlock::countsPerSecond() { #if LL_FASTTIMER_USE_RDTSC || !LL_WINDOWS //getCPUFrequency returns MHz and sCPUClockFrequency wants to be in Hz @@ -165,7 +165,7 @@ U64 TimeBlock::countsPerSecond() // counts per second for the *64-bit* timer #endif TimeBlock::TimeBlock(const char* name, bool open, TimeBlock* parent) -: TraceType(name), +: TraceType<TimeBlockAccumulator>(name), mCollapsed(true) { setCollapsed(!open); |