Added fixes to UnitTestFramework to get it compiling under Windows.

Make/debugtests.bat

@@ -76,7 +76,7 @@ osgimpostor Town.osg
 more memleaks.log
 
 echo osgmultitexture cessnafire.osg
-osmultitexture cessnafire.osg
+osgmultitexture cessnafire.osg
 more memleaks.log
 
 echo osgreflect cessna.osg

include/osg/UnitTestFramework

@@ -31,7 +31,7 @@ public:
 
 	typedef TestVisitor Visitor;    // Test is redundant
 
-	Test( const string& sName ) : _name( sName ) {}
+	Test( const std::string& sName ) : _name( sName ) {}
 
 	const std::string& name() const { return _name; }
 
@@ -80,7 +80,7 @@ private:
 	class TraceStream{
 
 	public:
-		TraceStream(std::ostream& o=cout, TraceLevel tl=Results);
+		TraceStream(std::ostream& o=std::cout, TraceLevel tl=Results);
 		~TraceStream();
 
 		void setTraceLevel(TraceLevel tl);
@@ -320,7 +320,7 @@ public:
 	virtual bool visitLeave( TestSuite* pSuite );
 
 	// Provide read-only access to the current qualifier
-	const string& currentPath() const;
+	const std::string& currentPath() const;
 
 private:
 
@@ -365,7 +365,7 @@ class SG_EXPORT TestRecord
 
 		// Onlye a TestReport can create a TestRecord
 		friend class TestReport;
-		TestRecord(const string& name);
+		TestRecord(const std::string& name);
 
 		enum Result{
 			Success,Failure,Error
@@ -394,7 +394,7 @@ class SG_EXPORT TestReport
 {
 public:
 
-	TestRecord&	createRecord(const string& s){
+	TestRecord&	createRecord(const std::string& s){
 		_records.push_back(TestRecord(s));
 		return _records.back();
 	}
@@ -429,7 +429,7 @@ public:
 		Specifying "root.osg.de" will run all tests (and suites) below
 		\em root.osg with names beginning with the \em de.
 	*/
-	void specify( const string& sQualifiedName );
+	void specify( const std::string& sQualifiedName );
 
 	bool visitEnter( TestSuite* pSuite );
 	bool visit( TestCase* pTest );

src/osg/UnitTestFramework.cpp

@@ -82,8 +82,8 @@ TestSuite* TestGraph::suite(const std::string& path, TestSuite* tsuite, bool cre
 
     list<string> pathComponents;
 
-    string::const_iterator it1 = path.begin();
-    string::const_iterator it2 = it1;
+    std::string::const_iterator it1 = path.begin();
+    std::string::const_iterator it2 = it1;
 
     // Dissect the path into it's constituent components
     do{
@@ -91,7 +91,7 @@ TestSuite* TestGraph::suite(const std::string& path, TestSuite* tsuite, bool cre
         while( *it2 != '.' && it2 != path.end() ) ++it2;
 
         // Consider a check for "" empty strings?
-        pathComponents.push_back( string(it1,it2) );
+        pathComponents.push_back( std::string(it1,it2) );
 
         if( it2 != path.end()) ++it2;
 
@@ -174,7 +174,7 @@ bool TestQualifier::visitLeave( TestSuite* pSuite )
 }
 
 // Provide read-only access to the current qualifier
-const string& TestQualifier::currentPath() const
+const std::string& TestQualifier::currentPath() const
 {
     return _path;
 }
@@ -221,7 +221,7 @@ void TestRecord::log(const std::string& s)
     problem_ = s;
 }
 
-TestRecord::TestRecord(const string& name):
+TestRecord::TestRecord(const std::string& name):
     name_(name),
     start_(0),
     stop_(0),
@@ -257,7 +257,7 @@ TestRunner::TestRunner( TestContext& ctx ) : _ctx( ctx )
 {
 }
 
-void TestRunner::specify( const string& sQualifiedName )
+void TestRunner::specify( const std::string& sQualifiedName )
 {
     _tests.push_back( sQualifiedName );
 }