From 1a139efbbc74d3aca261777aa0222c8687c3a78f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 18 Jul 2002 09:17:50 +0000 Subject: [PATCH] Added const to LessGeometry functor to fix Win32 build. --- include/osgUtil/Optimizer | 2 +- src/osgUtil/Optimizer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osgUtil/Optimizer b/include/osgUtil/Optimizer index 8c342321b..2f517d4aa 100644 --- a/include/osgUtil/Optimizer +++ b/include/osgUtil/Optimizer @@ -326,7 +326,7 @@ class OSGUTIL_EXPORT Optimizer MergeGeometryVisitor() : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) {} virtual void apply(osg::Geode& geode) { mergeGeode(geode); } - virtual void apply(osg::Billboard& billboard) { /* don't do anything*/ } + virtual void apply(osg::Billboard&) { /* don't do anything*/ } static bool mergeGeode(osg::Geode& geode); static bool mergeGeometry(osg::Geometry& lhs,osg::Geometry& rhs); diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index 2dbe7f319..b86e9568d 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -1170,7 +1170,7 @@ void Optimizer::CombineLODsVisitor::combineLODs() struct LessGeometry { - bool operator() (const osg::Geometry* lhs,const osg::Geometry* rhs) + bool operator() (const osg::Geometry* lhs,const osg::Geometry* rhs) const { if (lhs->getStateSet()getStateSet()) return true; if (rhs->getStateSet()getStateSet()) return false;