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.
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user