diff options
| author | Richard Linden <none@none> | 2013-06-17 01:20:27 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-17 01:20:27 -0700 |
| commit | 1cb0c974ae410479a1f72dab556ef7c9371970ee (patch) | |
| tree | 91a97b4b05e8085fdad17173b7ca874bb98a8805 /indra/llcommon/llprocessor.cpp | |
| parent | fc88265cffe3553803314c6e895a1e3a3c988171 (diff) | |
| parent | 3f2de87340b1c831ea59e4a3ca960d49f343c9fd (diff) | |
Merge
Diffstat (limited to 'indra/llcommon/llprocessor.cpp')
| -rwxr-xr-x | indra/llcommon/llprocessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 5ddfa6fcef..b80e813d84 100755 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -875,7 +875,7 @@ LLProcessorInfo::LLProcessorInfo() : mImpl(NULL) LLProcessorInfo::~LLProcessorInfo() {} -LLUnitImplicit<LLUnits::Megahertz, F64> LLProcessorInfo::getCPUFrequency() const { return mImpl->getCPUFrequency(); } +LLUnitImplicit<F64, LLUnits::Megahertz> LLProcessorInfo::getCPUFrequency() const { return mImpl->getCPUFrequency(); } bool LLProcessorInfo::hasSSE() const { return mImpl->hasSSE(); } bool LLProcessorInfo::hasSSE2() const { return mImpl->hasSSE2(); } bool LLProcessorInfo::hasAltivec() const { return mImpl->hasAltivec(); } |