From 21ff3d0d1ce10446cbb1cf9bc08d2c0ebe9705fe Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 29 Jun 2011 20:42:30 -0400
Subject: CHOP-753: fix minor compilation errors on Linux
---
indra/llcommon/llsys.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 40914dca3f..2897a533d9 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -1050,7 +1050,7 @@ LLMemoryInfo& LLMemoryInfo::refresh()
std::string line;
while (std::getline(meminfo, line))
{
- if (boost::regex_match(line, line+linelen, matched, stat_rx))
+ if (boost::regex_match(line, matched, stat_rx))
{
// e.g. "MemTotal: 4108424 kB"
LLSD::String key(matched[1].first, matched[1].second);
@@ -1068,11 +1068,11 @@ LLMemoryInfo& LLMemoryInfo::refresh()
}
else
{
- s << "Unable to collect memory information" << std::endl;
+ LL_WARNS("LLMemoryInfo") << "Unable to collect memory information" << LL_ENDL;
}
#else
- s << "Unknown system; unable to collect memory information" << std::endl;
+ LL_WARNS("LLMemoryInfo") << "Unknown system; unable to collect memory information" << LL_ENDL;
#endif
--
cgit v1.2.3