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.h | |
parent | fc88265cffe3553803314c6e895a1e3a3c988171 (diff) | |
parent | 3f2de87340b1c831ea59e4a3ca960d49f343c9fd (diff) |
Merge
Diffstat (limited to 'indra/llcommon/llprocessor.h')
-rwxr-xr-x | indra/llcommon/llprocessor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h index fbd427f484..7f220467b0 100755 --- a/indra/llcommon/llprocessor.h +++ b/indra/llcommon/llprocessor.h @@ -37,7 +37,7 @@ public: LLProcessorInfo(); ~LLProcessorInfo(); - LLUnitImplicit<LLUnits::Megahertz, F64> getCPUFrequency() const; + LLUnitImplicit<F64, LLUnits::Megahertz> getCPUFrequency() const; bool hasSSE() const; bool hasSSE2() const; bool hasAltivec() const; |