diff --git a/examples/osgdelaunay/osgdelaunay.cpp b/examples/osgdelaunay/osgdelaunay.cpp index ba9a48d9e..466d0a8d5 100644 --- a/examples/osgdelaunay/osgdelaunay.cpp +++ b/examples/osgdelaunay/osgdelaunay.cpp @@ -143,7 +143,7 @@ class LinearConstraint: public osgUtil::DelaunayConstraint { * if 2 roads cross, then the overlap will be replaced by a 'cross road' * and the roads built up to the cross roads with a texture along its length. */ public: - LinearConstraint() : DelaunayConstraint(), txxrepAlong(10), txyrepAcross(10), width(2) { } + LinearConstraint() : osgUtil::DelaunayConstraint(), txxrepAlong(10), txyrepAcross(10), width(2) { } /** geometry creation parameters */ /* Width of linear feature (eg road, railway) */ diff --git a/examples/osgdepthpartition/DepthPartitionNode.cpp b/examples/osgdepthpartition/DepthPartitionNode.cpp index 0f3562622..3ffd472f8 100644 --- a/examples/osgdepthpartition/DepthPartitionNode.cpp +++ b/examples/osgdepthpartition/DepthPartitionNode.cpp @@ -1,7 +1,10 @@ #include "DepthPartitionNode.h" #include +using namespace osg; + #define CURRENT_CLASS DepthPartitionNode + CURRENT_CLASS::CURRENT_CLASS() { _distAccumulator = new DistanceAccumulator; @@ -9,7 +12,7 @@ CURRENT_CLASS::CURRENT_CLASS() } CURRENT_CLASS::CURRENT_CLASS(const CURRENT_CLASS& dpn, const osg::CopyOp& copyop) - : Group(dpn, copyop), + : osg::Group(dpn, copyop), _active(dpn._active), _renderOrder(dpn._renderOrder), _clearColorBuffer(dpn._clearColorBuffer) diff --git a/src/osgProducer/GraphicsContextImplementation.cpp b/src/osgProducer/GraphicsContextImplementation.cpp index 0303bfb62..baa72c2e3 100644 --- a/src/osgProducer/GraphicsContextImplementation.cpp +++ b/src/osgProducer/GraphicsContextImplementation.cpp @@ -138,7 +138,7 @@ GraphicsContextImplementation::GraphicsContextImplementation(Traits* traits) } else { - getState()->setContextID( GraphicsContext::createNewContextID() ); + getState()->setContextID( osg::GraphicsContext::createNewContextID() ); } // but we share texture objects etc. so we also share the same contextID @@ -150,7 +150,7 @@ GraphicsContextImplementation::GraphicsContextImplementation(Traits* traits) // need to do something here.... setState( new osg::State ); - getState()->setContextID( GraphicsContext::createNewContextID() ); + getState()->setContextID( osg::GraphicsContext::createNewContextID() ); //_rs->realize(); } diff --git a/src/osgSim/OverlayNode.cpp b/src/osgSim/OverlayNode.cpp index 929677cd7..39cdf2d9b 100644 --- a/src/osgSim/OverlayNode.cpp +++ b/src/osgSim/OverlayNode.cpp @@ -20,6 +20,7 @@ #include using namespace osgSim; +using namespace osg; OverlayNode::OverlayNode(): _texEnvMode(GL_DECAL), @@ -31,7 +32,7 @@ OverlayNode::OverlayNode(): } OverlayNode::OverlayNode(const OverlayNode& copy, const osg::CopyOp& copyop): - Group(copy,copyop), + osg::Group(copy,copyop), _overlaySubgraph(copy._overlaySubgraph), _texEnvMode(copy._texEnvMode), _textureUnit(copy._textureUnit),