From abf34d2838e9d1fe6e7bd71423b41be101dc7168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Blissing?= Date: Fri, 3 Jun 2016 17:30:12 +0100 Subject: [PATCH] fix for the rest of the VS2015 virtual inheritance warnings. Same as for issues as for the Operation class. --- src/osgGA/CameraManipulator.cpp | 3 +-- src/osgGA/StandardManipulator.cpp | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/osgGA/CameraManipulator.cpp b/src/osgGA/CameraManipulator.cpp index c73bfeb16..c957f880b 100644 --- a/src/osgGA/CameraManipulator.cpp +++ b/src/osgGA/CameraManipulator.cpp @@ -21,8 +21,7 @@ CameraManipulator::CameraManipulator() CameraManipulator::CameraManipulator(const CameraManipulator& mm, const CopyOp& copyOp) - : osg::Callback(mm, copyOp), - inherited(mm, copyOp), + : inherited(mm, copyOp), _intersectTraversalMask(mm._intersectTraversalMask), _autoComputeHomePosition(mm._autoComputeHomePosition), _homeEye(mm._homeEye), diff --git a/src/osgGA/StandardManipulator.cpp b/src/osgGA/StandardManipulator.cpp index d0c73c71e..bdb8a5f7c 100644 --- a/src/osgGA/StandardManipulator.cpp +++ b/src/osgGA/StandardManipulator.cpp @@ -48,18 +48,17 @@ StandardManipulator::StandardManipulator( int flags ) /// Constructor. StandardManipulator::StandardManipulator( const StandardManipulator& uim, const CopyOp& copyOp ) - : osg::Callback(uim, copyOp), - inherited( uim, copyOp ), - _thrown( uim._thrown ), - _allowThrow( uim._allowThrow ), - _mouseCenterX(0.0f), _mouseCenterY(0.0f), - _ga_t1( dynamic_cast< GUIEventAdapter* >( copyOp( uim._ga_t1.get() ) ) ), - _ga_t0( dynamic_cast< GUIEventAdapter* >( copyOp( uim._ga_t0.get() ) ) ), - _delta_frame_time(0.01), _last_frame_time(0.0), - _modelSize( uim._modelSize ), - _verticalAxisFixed( uim._verticalAxisFixed ), - _flags( uim._flags ), - _relativeFlags( uim._relativeFlags ) + : inherited( uim, copyOp ), + _thrown( uim._thrown ), + _allowThrow( uim._allowThrow ), + _mouseCenterX(0.0f), _mouseCenterY(0.0f), + _ga_t1( dynamic_cast< GUIEventAdapter* >( copyOp( uim._ga_t1.get() ) ) ), + _ga_t0( dynamic_cast< GUIEventAdapter* >( copyOp( uim._ga_t0.get() ) ) ), + _delta_frame_time(0.01), _last_frame_time(0.0), + _modelSize( uim._modelSize ), + _verticalAxisFixed( uim._verticalAxisFixed ), + _flags( uim._flags ), + _relativeFlags( uim._relativeFlags ) { }