diff options
| author | Richard Linden <none@none> | 2013-06-18 23:42:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-18 23:42:59 -0700 |
| commit | 8977f43230bda6d7f814e770ba574d016a3875fa (patch) | |
| tree | 16b30705c490a250893699c486e63d4d97c0003f /indra/llcommon/llprocessor.cpp | |
| parent | 1bc1d532cff1539bb5366f87b602970f1d2a8929 (diff) | |
| parent | d136c4c29686c565b5a46503aa67a9c958b4145d (diff) | |
Automated merge with bundle:d:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.7jrj8n\https__bitbucket.org_lindenlab_viewer-interesting_jch9cd.hg
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(); } |