From Laurens Loerman, Fix for "Visual Studio 2013 gives me a large amount (2778) of warnings about inheritance via dominace (C4250)."

2016-02-15 12:37:05 +00:00
parent 9bde2ef631
commit 937ef73521
5 changed files with 19 additions and 0 deletions
--- a/include/osgAnimation/AnimationUpdateCallback
+++ b/include/osgAnimation/AnimationUpdateCallback
@@ -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)