From 258fe82db79f995cb18c71fb65b5e7b038f308bf Mon Sep 17 00:00:00 2001
From: Player Dagostino <playerdagostino@gmail.com>
Date: Tue, 2 Aug 2011 20:28:54 +0200
Subject: [PATCH] Fix a conflict with tut arising when compiling with gcc 4.6.
 It also looks like tut::test_result::skip got renamed to
 tut::test_result::skipped in revision 190.

---
 indra/test/lltut.cpp | 2 +-
 indra/test/test.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/test/lltut.cpp b/indra/test/lltut.cpp
index 201e174f9..102e8a10e 100644
--- a/indra/test/lltut.cpp
+++ b/indra/test/lltut.cpp
@@ -94,7 +94,7 @@ namespace tut
 				return;
 			
 			case LLSD::TypeReal:
-				ensure_equals(msg + " real", actual.asReal(), expected.asReal());
+				tut::ensure_equals(msg + " real", actual.asReal(), expected.asReal());
 				return;
 			
 			case LLSD::TypeString:
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index d8f00c602..8baa6fb09 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -108,7 +108,7 @@ public:
 			++mFailedTests;
 			out << "abnormal termination";
 			break;
-		case tut::test_result::skip:
+		case tut::test_result::skipped:
 			++mSkippedTests;
 			out << "skipped known failure";
 			break;