From 8db1250b73b89727b60ba852bb65cf09ff824993 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 17 Oct 2014 14:08:58 -0700 Subject: Update to build on Xcode 6.0: collection of similar const var not used warnings/errors [-Wunused-const-variable] --- indra/llcommon/llsys.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/llcommon/llsys.cpp') diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 06e118aa44..c9db73eb99 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -99,8 +99,6 @@ const char MEMINFO_FILE[] = "/proc/meminfo"; extern int errno; #endif - -static const S32 CPUINFO_BUFFER_SIZE = 16383; LLCPUInfo gSysCPU; // Don't log memory info any more often than this. It also serves as our @@ -672,8 +670,6 @@ const std::string& LLOSInfo::getOSVersionString() const return mOSVersionString; } -const S32 STATUS_SIZE = 8192; - //static U32 LLOSInfo::getProcessVirtualSizeKB() { -- cgit v1.3 From 111900150d7e80f4f97f26ceb413aea2a5965d73 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 22 Dec 2014 16:42:55 -0500 Subject: work arounds to compile on linux --- indra/llcommon/llprocessor.cpp | 2 +- indra/llcommon/llsys.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llcommon/llsys.cpp') diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 1ee3c7edb0..e3e1d0c391 100755 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -778,7 +778,7 @@ private: setInfo(eFamily, family); } - setInfo(eFamilyName, compute_CPUFamilyName(cpuinfo["vendor_id"].c_str(), family)); + setInfo(eFamilyName, compute_CPUFamilyName(cpuinfo["vendor_id"].c_str(), family, 0)); // setInfo(eExtendedModel, getSysctlInt("machdep.cpu.extmodel")); // setInfo(eBrandID, getSysctlInt("machdep.cpu.brand")); diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index c9db73eb99..1a66612e87 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -677,6 +677,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB() #if LL_WINDOWS #endif #if LL_LINUX +# define STATUS_SIZE 2048 LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); if (status_filep) { -- cgit v1.3