diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-20 17:37:44 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-20 17:37:44 +0300 |
| commit | 2da402498f64b982edfe2ba6545780a16731ad34 (patch) | |
| tree | b71b69e1e634266b7e5bc3e4d2a910d1798202f6 /indra/llcommon/llfasttimer_class.cpp | |
| parent | 3c45631cbc4b1f26143f05e9a58f0349679e663a (diff) | |
| parent | 5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/llfasttimer_class.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer_class.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index 2e5edb1f3b..f39a4e6619 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -230,17 +230,17 @@ void LLFastTimer::DeclareTimer::updateCachedPointers() } //static -#if LL_LINUX || LL_SOLARIS || ( LL_DARWIN && !(defined(__i386__) || defined(__amd64__)) ) +#if (LL_DARWIN || LL_LINUX || LL_SOLARIS) && !(defined(__i386__) || defined(__amd64__)) U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer { return sClockResolution >> 8; } -#else // windows or x86-mac +#else // windows or x86-mac or x86-linux or x86-solaris U64 LLFastTimer::countsPerSecond() // counts per second for the *32-bit* timer { static U64 sCPUClockFrequency = U64(CProcessor().GetCPUFrequency(50)); - // we drop the low-order byte in out timers, so report a lower frequency + // we drop the low-order byte in our timers, so report a lower frequency return sCPUClockFrequency >> 8; } #endif |