summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-03 12:53:50 -0800
committerMerov Linden <merov@lindenlab.com>2011-03-03 12:53:50 -0800
commita8b9392fd83c9fcd2261e76a135d451ae5b90e9b (patch)
tree53b404409dc32614c4f7e552f74f590fecbeac06
parent149ace0b1f3f9bb6394aec367da5748bc092ef7a (diff)
Autobuild : fix llcommon tests warning so Mac builds
-rw-r--r--indra/llcommon/tests/llerror_test.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index 1ef8fc9712..2350059626 100644
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -48,7 +48,10 @@ namespace
{
static bool fatalWasCalled;
void fatalCall(const std::string&) { fatalWasCalled = true; }
+}
+namespace tut
+{
class TestRecorder : public LLError::Recorder
{
public:
@@ -82,10 +85,7 @@ namespace
bool mWantsTime;
};
-}
-
-namespace tut
-{
+
struct ErrorTestData
{
TestRecorder mRecorder;
@@ -381,7 +381,7 @@ namespace
}
typedef std::string (*LogFromFunction)(bool);
- void testLogName(TestRecorder& recorder, LogFromFunction f,
+ void testLogName(tut::TestRecorder& recorder, LogFromFunction f,
const std::string& class_name = "")
{
recorder.clearMessages();