FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for Win32 build.

Browse Source
This commit is contained in:
Robert Osfield
2002-08-28 16:59:22 +00:00
parent bd87e19068
commit ebb8a635d2
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/osg/UnitTestFramework
View File

@@ -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;
};

12
src/osg/UnitTestFramework.cpp
View File

@@ -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") );
}