From aef2574b8dac57b817c3f5a7877ae1b51cc9f9b3 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 8 Jun 2016 09:46:09 +0100
Subject: [PATCH] Fixed -Wextra warnings

---
 include/osgAnimation/StackedTransform      | 3 +++
 src/osgAnimation/ActionCallback.cpp        | 2 +-
 src/osgAnimation/AnimationManagerBase.cpp  | 5 ++++-
 src/osgAnimation/Skeleton.cpp              | 1 +
 src/osgAnimation/StackedTransform.cpp      | 3 ++-
 src/osgAnimation/UpdateMatrixTransform.cpp | 5 ++++-
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/include/osgAnimation/StackedTransform b/include/osgAnimation/StackedTransform
index c91a51996..296dc5f74 100644
--- a/include/osgAnimation/StackedTransform
+++ b/include/osgAnimation/StackedTransform
@@ -32,6 +32,9 @@ namespace osgAnimation
         const osg::Matrix& getMatrix() const;
 
     protected:
+
+        typedef osg::MixinVector<osg::ref_ptr<StackedTransformElement> > inherited;
+
         osg::Matrix _matrix;
     };
 
diff --git a/src/osgAnimation/ActionCallback.cpp b/src/osgAnimation/ActionCallback.cpp
index 143d8f435..ebfb7735b 100644
--- a/src/osgAnimation/ActionCallback.cpp
+++ b/src/osgAnimation/ActionCallback.cpp
@@ -15,7 +15,7 @@
 #include <osgAnimation/ActionCallback>
 #include <osgAnimation/Timeline>
 
-void osgAnimation::RunAction::operator()(Action* action, ActionVisitor* visitor)
+void osgAnimation::RunAction::operator()(Action* /*action*/, ActionVisitor* visitor)
 {
     Timeline* tm = visitor->getCurrentTimeline();
     tm->addActionNow(_action.get(), _priority);
diff --git a/src/osgAnimation/AnimationManagerBase.cpp b/src/osgAnimation/AnimationManagerBase.cpp
index f5b3c1aeb..da6b8b040 100644
--- a/src/osgAnimation/AnimationManagerBase.cpp
+++ b/src/osgAnimation/AnimationManagerBase.cpp
@@ -62,7 +62,10 @@ void AnimationManagerBase::operator()(osg::Node* node, osg::NodeVisitor* nv)
 }
 
 
-AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::NodeCallback(b,copyop) // TODO check this
+AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) :
+    osg::Object(b,copyop),
+    osg::Callback(b,copyop),
+    osg::NodeCallback(b,copyop) // TODO check this
 {
     const AnimationList& animationList = b.getAnimationList();
     for (AnimationList::const_iterator it = animationList.begin();
diff --git a/src/osgAnimation/Skeleton.cpp b/src/osgAnimation/Skeleton.cpp
index 9bc09ab72..85da3cc71 100644
--- a/src/osgAnimation/Skeleton.cpp
+++ b/src/osgAnimation/Skeleton.cpp
@@ -26,6 +26,7 @@ Skeleton::UpdateSkeleton::UpdateSkeleton() : _needValidate(true) {}
 
 Skeleton::UpdateSkeleton::UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop) :
     osg::Object(us, copyop),
+    osg::Callback(us, copyop),
     osg::NodeCallback(us, copyop)
 {
     _needValidate = true;
diff --git a/src/osgAnimation/StackedTransform.cpp b/src/osgAnimation/StackedTransform.cpp
index a56b35f1a..9be0a4652 100644
--- a/src/osgAnimation/StackedTransform.cpp
+++ b/src/osgAnimation/StackedTransform.cpp
@@ -18,7 +18,8 @@ using namespace osgAnimation;
 
 StackedTransform::StackedTransform() {}
 
-StackedTransform::StackedTransform(const StackedTransform& rhs, const osg::CopyOp& co)
+StackedTransform::StackedTransform(const StackedTransform& rhs, const osg::CopyOp& co):
+    inherited(rhs)
 {
     reserve(rhs.size());
     for (StackedTransform::const_iterator it = rhs.begin(); it != rhs.end(); ++it)
diff --git a/src/osgAnimation/UpdateMatrixTransform.cpp b/src/osgAnimation/UpdateMatrixTransform.cpp
index e3c0147ef..7de9f1afb 100644
--- a/src/osgAnimation/UpdateMatrixTransform.cpp
+++ b/src/osgAnimation/UpdateMatrixTransform.cpp
@@ -18,7 +18,10 @@
 
 using namespace osgAnimation;
 
-UpdateMatrixTransform::UpdateMatrixTransform( const UpdateMatrixTransform& apc,const osg::CopyOp& copyop) : osg::Object(apc,copyop), AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
+UpdateMatrixTransform::UpdateMatrixTransform( const UpdateMatrixTransform& apc,const osg::CopyOp& copyop) :
+    osg::Object(apc,copyop),
+    osg::Callback(apc,copyop),
+    AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
 {
     _transforms = StackedTransform(apc.getStackedTransforms(), copyop);
 }