From Laurens Loerman, Fix for "Visual Studio 2013 gives me a large amount (2778) of warnings about inheritance via dominace (C4250)."
This commit is contained in:
@@ -33,6 +33,9 @@ class OSG_EXPORT ClusterCullingCallback : public DrawableCullCallback, public No
|
||||
|
||||
META_Object(osg,ClusterCullingCallback);
|
||||
|
||||
virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); }
|
||||
virtual const NodeCallback* asNodeCallback() const { return osg::NodeCallback::asNodeCallback(); }
|
||||
|
||||
// use the NodeCallbacks implementation of run.
|
||||
virtual bool run(osg::Object* object, osg::Object* data) { return NodeCallback::run(object, data); }
|
||||
|
||||
|
||||
@@ -41,6 +41,13 @@ namespace osgAnimation
|
||||
|
||||
META_Object(osgAnimation, AnimationUpdateCallback<T>);
|
||||
|
||||
virtual osg::Callback* asCallback() { return T::asCallback(); }
|
||||
virtual const osg::Callback* asCallback() const { return T::asCallback(); }
|
||||
|
||||
virtual osg::CallbackObject* asCallbackObject() { return T::asCallbackObject(); }
|
||||
virtual const osg::CallbackObject* asCallbackObject() const { return T::asCallbackObject(); }
|
||||
|
||||
|
||||
const std::string& getName() const { return T::getName(); }
|
||||
bool link(Channel* /*channel*/) { return 0; }
|
||||
int link(Animation* animation)
|
||||
|
||||
@@ -43,6 +43,9 @@ public:
|
||||
|
||||
META_Object(osgGA, EventHandler);
|
||||
|
||||
virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); }
|
||||
virtual const NodeCallback* asNodeCallback() const { return osg::NodeCallback::asNodeCallback(); }
|
||||
|
||||
virtual bool run(osg::Object* object, osg::Object* data)
|
||||
{
|
||||
osg::Node* node = dynamic_cast<osg::Node*>(object);
|
||||
|
||||
@@ -510,6 +510,9 @@ public:
|
||||
|
||||
META_Object(osgViewer, InteractiveImageHandler);
|
||||
|
||||
virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); }
|
||||
virtual const NodeCallback* asNodeCallback() const { return osg::NodeCallback::asNodeCallback(); }
|
||||
|
||||
// use the osgGA::GUIEventHandler implementation of run.
|
||||
virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); }
|
||||
|
||||
|
||||
@@ -487,6 +487,9 @@ class OSGVOLUME_EXPORT PropertyAdjustmentCallback : public osgGA::GUIEventHandle
|
||||
|
||||
META_Object(osgVolume, PropertyAdjustmentCallback);
|
||||
|
||||
virtual NodeCallback* asNodeCallback() { return osg::NodeCallback::asNodeCallback(); }
|
||||
virtual const NodeCallback* asNodeCallback() const { return osg::NodeCallback::asNodeCallback(); }
|
||||
|
||||
virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); }
|
||||
|
||||
void setKeyEventCycleForward(int key) { _cyleForwardKey = key; }
|
||||
|
||||
Reference in New Issue
Block a user