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/llsys.h | |
parent | 3c45631cbc4b1f26143f05e9a58f0349679e663a (diff) | |
parent | 5952fbca316ba1d1e4243bf5ebd6dc647e4957f4 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/llsys.h')
-rw-r--r-- | indra/llcommon/llsys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index c2c45bec9a..0b34951149 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -81,7 +81,7 @@ public: bool hasAltivec() const; bool hasSSE() const; bool hasSSE2() const; - S32 getMhz() const; + F64 getMHz() const; // Family is "AMD Duron" or "Intel Pentium Pro" const std::string& getFamily() const { return mFamily; } @@ -90,7 +90,7 @@ private: bool mHasSSE; bool mHasSSE2; bool mHasAltivec; - S32 mCPUMhz; + F64 mCPUMHz; std::string mFamily; std::string mCPUString; }; |