From 25a91d97f07754849cd18901f7ec39f326fee037 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 13 Aug 2006 07:37:55 +0000 Subject: [PATCH] From Chuck Sembroski, fixes for IRIX --- src/osgParticle/PrecipitationEffect.cpp | 2 +- src/osgPlugins/OpenFlight/Pools.h | 2 +- src/osgSim/OpenFlightOptimizer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgParticle/PrecipitationEffect.cpp b/src/osgParticle/PrecipitationEffect.cpp index 9342630c6..b18ff92a7 100644 --- a/src/osgParticle/PrecipitationEffect.cpp +++ b/src/osgParticle/PrecipitationEffect.cpp @@ -861,7 +861,7 @@ PrecipitationEffect::PrecipitationDrawable::PrecipitationDrawable(): } PrecipitationEffect::PrecipitationDrawable::PrecipitationDrawable(const PrecipitationDrawable& copy, const osg::CopyOp& copyop): - Drawable(copy,copyop), + osg::Drawable(copy,copyop), _requiresPreviousMatrix(copy._requiresPreviousMatrix), _geometry(copy._geometry), _drawType(copy._drawType), diff --git a/src/osgPlugins/OpenFlight/Pools.h b/src/osgPlugins/OpenFlight/Pools.h index 7d153bdba..f6ccaa0cb 100644 --- a/src/osgPlugins/OpenFlight/Pools.h +++ b/src/osgPlugins/OpenFlight/Pools.h @@ -218,7 +218,7 @@ public: TexturePool* texture, LightPointAppearancePool* lpAppearance, ShaderPool* shader ) - : Referenced(), + : osg::Referenced(), _colorPool( color ), _materialPool( material ), _texturePool( texture ), diff --git a/src/osgSim/OpenFlightOptimizer.cpp b/src/osgSim/OpenFlightOptimizer.cpp index 0c3a0cbcb..ad714edd7 100644 --- a/src/osgSim/OpenFlightOptimizer.cpp +++ b/src/osgSim/OpenFlightOptimizer.cpp @@ -155,7 +155,7 @@ class GeodeStateOptimizer : public osgUtil::Optimizer::StateVisitor } } - StateVisitor::optimize(); + osgUtil::Optimizer::StateVisitor::optimize(); }