Warning fixes for IRIX

This commit is contained in:
Robert Osfield
2005-05-16 15:51:57 +00:00
parent af0abf58ef
commit 428608e781
5 changed files with 54 additions and 75 deletions

View File

@@ -349,40 +349,24 @@ void SphereSegment::init()
addDrawable(new Spoke(this,MAX,MAX));
}
namespace
{
struct DirtyDisplayList
{
void operator()(osg::ref_ptr<osg::Drawable>& dptr)
{
dptr->dirtyDisplayList();
}
};
}
void SphereSegment::dirtyAllDrawableDisplayLists()
{
std::for_each(_drawables.begin(), _drawables.end(), DirtyDisplayList());
}
namespace
{
struct DirtyBound
{
void operator()(osg::ref_ptr<osg::Drawable>& dptr)
for(DrawableList::iterator itr = _drawables.begin();
itr != _drawables.end();
++itr)
{
dptr->dirtyBound();
(*itr)->dirtyDisplayList();
}
};
}
void SphereSegment::dirtyAllDrawableBounds()
{
std::for_each(_drawables.begin(), _drawables.end(), DirtyBound());
for(DrawableList::iterator itr = _drawables.begin();
itr != _drawables.end();
++itr)
{
(*itr)->dirtyBound();
}
}
void SphereSegment::Surface_drawImplementation(osg::State& /* state */) const
@@ -898,8 +882,6 @@ void SphereSegment::setDrawMask(DrawMask dm)
dirtyBound();
}
namespace{
struct ActivateTransparencyOnType
{
ActivateTransparencyOnType(const std::type_info& t): _t(t) {}
@@ -939,8 +921,6 @@ struct DeactivateTransparencyOnType
const std::type_info& _t;
};
}
void SphereSegment::setSurfaceColor(const osg::Vec4& c)
{
_surfaceColor=c;