From 6d1ba6c0f48ed1377e412817cedf8af6c4c2df07 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Mon, 11 Nov 2002 20:18:27 +0000 Subject: [PATCH] Fixed a const/non-const inconsistency in NodeVisitor.cpp Fixed a blank namespace issue in UnitTestFramework.cpp --- src/osg/NodeVisitor.cpp | 2 +- src/osg/UnitTestFramework.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osg/NodeVisitor.cpp b/src/osg/NodeVisitor.cpp index 5f0fc31d3..e2ee32a26 100644 --- a/src/osg/NodeVisitor.cpp +++ b/src/osg/NodeVisitor.cpp @@ -33,7 +33,7 @@ NodeVisitor::~NodeVisitor() } -void NodeVisitor::setTraversalMode(const TraversalMode mode) +void NodeVisitor::setTraversalMode(TraversalMode mode) { if (_traversalMode==mode) return; if (mode==TRAVERSE_VISITOR) diff --git a/src/osg/UnitTestFramework.cpp b/src/osg/UnitTestFramework.cpp index 2737006cb..ee7c600cc 100644 --- a/src/osg/UnitTestFramework.cpp +++ b/src/osg/UnitTestFramework.cpp @@ -270,7 +270,7 @@ bool TestRunner::visitEnter( TestSuite* pSuite ) #ifndef DOXYGEN_SHOULD_SKIP_THIS -namespace{ +namespace osgUtx{ struct isSpecified{ @@ -290,7 +290,7 @@ struct isSpecified{ bool TestRunner::visit( TestCase* pTest ) { if ( std::find_if(_tests.begin(),_tests.end(), - isSpecified(currentPath() + pTest->name() ) ) != _tests.end()) perform( pTest ); + osgUtx::isSpecified(currentPath() + pTest->name() ) ) != _tests.end()) perform( pTest ); return !_ctx.shouldStop(); }