Last two files with fixes to the virtual inheritance warnings...

I have also attached the fix to the type shadowing problem in ConvexPolyhedron.cpp
This commit is contained in:
Björn Blissing 2016-06-03 17:33:45 +01:00 committed by Robert Osfield
parent abf34d2838
commit 6c842a534e
3 changed files with 6 additions and 8 deletions

View File

@ -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(); const AnimationList& animationList = b.getAnimationList();
for (AnimationList::const_iterator it = animationList.begin(); for (AnimationList::const_iterator it = animationList.begin();

View File

@ -817,11 +817,11 @@ void ConvexPolyhedron::removeDuplicateVertices( void )
// Aggressive removal, find very close points and replace them // Aggressive removal, find very close points and replace them
// with their average. Second step wil do the rest. // 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; typedef std::set< osg::Vec3d > VertexSet;
VertexSet vertexSet; VertexSet vertexSet;
Points points; PointMap points;
for( Faces::iterator itr = _faces.begin(); for( Faces::iterator itr = _faces.begin();
itr != _faces.end(); itr != _faces.end();
@ -842,7 +842,7 @@ void ConvexPolyhedron::removeDuplicateVertices( void )
points[ *vitr ] += osg::Vec4d( *vitr, 1.0 ); points[ *vitr ] += osg::Vec4d( *vitr, 1.0 );
} }
for( Points::iterator itr = points.begin(); for(PointMap::iterator itr = points.begin();
itr != points.end(); itr != points.end();
++itr ) ++itr )
{ {

View File

@ -40,14 +40,12 @@ static osg::ApplicationUsageProxy ViewerBase_e5(osg::ApplicationUsage::ENVIRONME
using namespace osgViewer; using namespace osgViewer;
ViewerBase::ViewerBase(): ViewerBase::ViewerBase()
osg::Object(true)
{ {
viewerBaseInit(); viewerBaseInit();
} }
ViewerBase::ViewerBase(const ViewerBase&): ViewerBase::ViewerBase(const ViewerBase&)
osg::Object(true)
{ {
viewerBaseInit(); viewerBaseInit();
} }