summaryrefslogtreecommitdiff
path: root/indra/llcommon/llprocessor.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-03-12 12:48:43 -0700
committerRichard Linden <none@none>2014-03-12 12:48:43 -0700
commit5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (patch)
tree438dd649dbcc0584709251c6926a476b0db02f85 /indra/llcommon/llprocessor.h
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
parent5f513242890068f569df7e50a5ac0ba3bdd23f05 (diff)
merge with release
Diffstat (limited to 'indra/llcommon/llprocessor.h')
-rwxr-xr-xindra/llcommon/llprocessor.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h
index 6364d3c8bb..90e5bc59ee 100755
--- a/indra/llcommon/llprocessor.h
+++ b/indra/llcommon/llprocessor.h
@@ -27,6 +27,8 @@
#ifndef LLPROCESSOR_H
#define LLPROCESSOR_H
+#include "llunits.h"
+
class LLProcessorInfoImpl;
class LL_COMMON_API LLProcessorInfo
@@ -35,7 +37,7 @@ public:
LLProcessorInfo();
~LLProcessorInfo();
- F64 getCPUFrequency() const;
+ F64MegahertzImplicit getCPUFrequency() const;
bool hasSSE() const;
bool hasSSE2() const;
bool hasAltivec() const;