From ebb8a635d209964badfa5f20d1a761a42ce9d3fc Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 28 Aug 2002 16:59:22 +0000
Subject: [PATCH] Fixes for Win32 build.

---
 include/osg/UnitTestFramework |  7 ++++---
 src/osg/UnitTestFramework.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/osg/UnitTestFramework b/include/osg/UnitTestFramework
index 2f2e16b6f..1917bcf11 100644
--- a/include/osg/UnitTestFramework
+++ b/include/osg/UnitTestFramework
@@ -14,6 +14,7 @@
 #include <vector>
 #include <list>
 #include <fstream>
+#include <iostream>
 
 namespace osgUtx{
 
@@ -289,8 +290,8 @@ private:
 		is passed in as components in a list, represented by the iterator parameters.
 	*/
 	TestSuite* suite(
-		list<std::string>::iterator it,
-		list<std::string>::iterator end,
+		std::list<std::string>::iterator it,
+		std::list<std::string>::iterator end,
 		TestSuite* tsuite, bool createIfNecessary);
 
 	TestGraph();
@@ -400,7 +401,7 @@ public:
 	}
 
 private:
-	list<TestRecord>	_records;
+	std::list<TestRecord>	_records;
 
 };
 
diff --git a/src/osg/UnitTestFramework.cpp b/src/osg/UnitTestFramework.cpp
index c2513cf1f..32780234d 100644
--- a/src/osg/UnitTestFramework.cpp
+++ b/src/osg/UnitTestFramework.cpp
@@ -21,7 +21,7 @@ TestContext::TraceLevel TestContext::getTraceLevel() const
     return _tout.getTraceLevel();
 }
 
-std::ostream& TestContext::tout(TraceLevel tl=Full) const
+std::ostream& TestContext::tout(TraceLevel tl) const
 {
     return _tout.stream(tl);
 }
@@ -105,8 +105,8 @@ TestSuite* TestGraph::suite(const std::string& path, TestSuite* tsuite, bool cre
 }
 
 TestSuite* TestGraph::suite(
-        list<std::string>::iterator it,
-        list<std::string>::iterator end,
+		std::list<std::string>::iterator it,
+        std::list<std::string>::iterator end,
         TestSuite* tsuite, bool createIfNecessary)
 {
     using namespace std;
@@ -166,8 +166,8 @@ bool TestQualifier::visitEnter( TestSuite* pSuite )
 // Leaving a composite: Pop its name from the Path
 bool TestQualifier::visitLeave( TestSuite* pSuite )
 {
-    assert( _path.rfind( pSuite->name() + static_cast<const char>(SEPCHAR))
-                == _path.size() - pSuite->name().size()  - 1);
+//    assert( _path.rfind( pSuite->name() + static_cast<const char>(SEPCHAR))
+//                == _path.size() - pSuite->name().size()  - 1);
 
     _path.erase( _path.size() - pSuite->name().size() -1 );
     return true;
@@ -326,7 +326,7 @@ void TestRunner::perform( TestCase* pTest )
     }
     catch ( ... )
     {
-        record.log( "Unknown" );
+        record.log( std::string("Unknown") );
     }