summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-17 14:08:58 -0700
committercallum_linden <none@none>2014-10-17 14:08:58 -0700
commit8db1250b73b89727b60ba852bb65cf09ff824993 (patch)
tree95c67b3604848c1ad9bd8aec92ef0d6ebdea3dc6 /indra/llcommon
parent5c5821b7583bf55889bb13147376919553727a01 (diff)
Update to build on Xcode 6.0: collection of similar const var not used warnings/errors [-Wunused-const-variable]
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/llsys.cpp4
-rwxr-xr-xindra/llcommon/lltimer.cpp4
2 files changed, 0 insertions, 8 deletions
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()
{
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index ab105a82e6..76e892212a 100755
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -39,14 +39,10 @@
# error "architecture not supported"
#endif
-
//
// Locally used constants
//
-const F64 SEC_TO_MICROSEC = 1000000.f;
const U64 SEC_TO_MICROSEC_U64 = 1000000;
-const F64 USEC_TO_SEC_F64 = 0.000001;
-
//---------------------------------------------------------------------------
// Globals and statics