From 2c16c5b87d1c55619a6ba1b5b818ba54866ea754 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 5 Jun 2007 14:37:55 +0000 Subject: [PATCH] Change interator to const_iterator to try and avoid Solaris build failure --- include/osgManipulator/Dragger | 4 ++-- src/osgWrappers/osgManipulator/Dragger.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/osgManipulator/Dragger b/include/osgManipulator/Dragger index e7764dc13..556e55fda 100644 --- a/include/osgManipulator/Dragger +++ b/include/osgManipulator/Dragger @@ -52,7 +52,7 @@ class OSGMANIPULATOR_EXPORT PointerInfo } - bool completed() { return _hitIter==_hitList.end(); } + bool completed() const { return _hitIter==_hitList.end(); } void next() { @@ -120,7 +120,7 @@ class OSGMANIPULATOR_EXPORT PointerInfo public: IntersectionList _hitList; - IntersectionList::iterator _hitIter; + IntersectionList::const_iterator _hitIter; protected: diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index 6c38f0335..92e4fba32 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -256,7 +256,6 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo) __osg_Vec3__getLocalIntersectPoint, 0); I_PublicMemberProperty(osgManipulator::PointerInfo::IntersectionList, _hitList); - I_PublicMemberProperty(osgManipulator::PointerInfo::IntersectionList::iterator, _hitIter); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Dragger >)