diff --git a/src/osgAnimation/AnimationManagerBase.cpp b/src/osgAnimation/AnimationManagerBase.cpp index 03e9b2abb..f5b3c1aeb 100644 --- a/src/osgAnimation/AnimationManagerBase.cpp +++ b/src/osgAnimation/AnimationManagerBase.cpp @@ -62,7 +62,7 @@ void AnimationManagerBase::operator()(osg::Node* node, osg::NodeVisitor* nv) } -AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::Callback(b, copyop), osg::NodeCallback(b,copyop) // TODO check this +AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::NodeCallback(b,copyop) // TODO check this { const AnimationList& animationList = b.getAnimationList(); for (AnimationList::const_iterator it = animationList.begin(); diff --git a/src/osgShadow/ConvexPolyhedron.cpp b/src/osgShadow/ConvexPolyhedron.cpp index 2c87dc544..5d38bf432 100644 --- a/src/osgShadow/ConvexPolyhedron.cpp +++ b/src/osgShadow/ConvexPolyhedron.cpp @@ -817,11 +817,11 @@ void ConvexPolyhedron::removeDuplicateVertices( void ) // Aggressive removal, find very close points and replace them // with their average. Second step wil do the rest. - typedef std::map< osg::Vec3f, osg::Vec4d > Points; + typedef std::map< osg::Vec3f, osg::Vec4d > PointMap; typedef std::set< osg::Vec3d > VertexSet; VertexSet vertexSet; - Points points; + PointMap points; for( Faces::iterator itr = _faces.begin(); itr != _faces.end(); @@ -842,7 +842,7 @@ void ConvexPolyhedron::removeDuplicateVertices( void ) points[ *vitr ] += osg::Vec4d( *vitr, 1.0 ); } - for( Points::iterator itr = points.begin(); + for(PointMap::iterator itr = points.begin(); itr != points.end(); ++itr ) { diff --git a/src/osgViewer/ViewerBase.cpp b/src/osgViewer/ViewerBase.cpp index 1860f9656..a517f3e6e 100644 --- a/src/osgViewer/ViewerBase.cpp +++ b/src/osgViewer/ViewerBase.cpp @@ -40,14 +40,12 @@ static osg::ApplicationUsageProxy ViewerBase_e5(osg::ApplicationUsage::ENVIRONME using namespace osgViewer; -ViewerBase::ViewerBase(): - osg::Object(true) +ViewerBase::ViewerBase() { viewerBaseInit(); } -ViewerBase::ViewerBase(const ViewerBase&): - osg::Object(true) +ViewerBase::ViewerBase(const ViewerBase&) { viewerBaseInit(); }