From d4c4bee020c27d977899e91affa15bda2857e826 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 2 Jul 2014 10:25:29 +0000 Subject: [PATCH] From Laurens Voerman, "just like ClusterCullingCallback (fixed in r14322) visual studio likes an explicit implementation of run() for InteractiveImageHandler. The warning is (14 times): include\osgViewer/ViewerEventHandlers(542): warning C4250: 'osgViewer::InteractiveImageHandler' : inherits 'osgGA::EventHandler::osgGA::EventHandler::run' via dominance (src\osgViewer\StatsHandler.cpp) include\osgGA/EventHandler(45) : see declaration of 'osgGA::EventHandler::run' attached a zipped version of include\osgViewer\ViewerEventHandlers" git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14343 16af8721-9629-0410-8352-f15c8da7e697 --- include/osgViewer/ViewerEventHandlers | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/osgViewer/ViewerEventHandlers b/include/osgViewer/ViewerEventHandlers index 4fb0a43eb..659e59b1a 100644 --- a/include/osgViewer/ViewerEventHandlers +++ b/include/osgViewer/ViewerEventHandlers @@ -514,7 +514,8 @@ public: META_Object(osgViewer, InteractiveImageHandler); - using osgGA::GUIEventHandler::run; + // use the osgGA::GUIEventHandler implementation of run. + virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); } virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor* nv);