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

---
 include/osg/OperationThread |  4 ----
 src/osg/CMakeLists.txt      | 11 +++++++++++
 src/osg/KdTree.cpp          |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/osg/OperationThread b/include/osg/OperationThread
index a62157ea1..a357c22e4 100644
--- a/include/osg/OperationThread
+++ b/include/osg/OperationThread
@@ -79,10 +79,6 @@ protected:
         Operation():
             _keep(false) {}
 
-        Operation(const Operation& op):
-            _name(op._name),
-            _keep(op._keep) {}
-
         virtual ~Operation() {}
 
         std::string _name;
diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt
index 7fae3aceb..f1ff8321b 100644
--- a/src/osg/CMakeLists.txt
+++ b/src/osg/CMakeLists.txt
@@ -420,6 +420,17 @@ SET(TARGET_SRC
 
     ${OPENSCENEGRAPH_VERSIONINFO_RC}
 )
+
+################################################################################
+## Quieten warnings that a due to optional code paths
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
+
+
 SET(TARGET_LIBRARIES OpenThreads)
 
 SET(TARGET_EXTERNAL_LIBRARIES
diff --git a/src/osg/KdTree.cpp b/src/osg/KdTree.cpp
index a1afac029..329b91bc1 100644
--- a/src/osg/KdTree.cpp
+++ b/src/osg/KdTree.cpp
@@ -795,6 +795,7 @@ KdTreeBuilder::KdTreeBuilder():
 }
 
 KdTreeBuilder::KdTreeBuilder(const KdTreeBuilder& rhs):
+    osg::Object(rhs),
     osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
     _buildOptions(rhs._buildOptions),
     _kdTreePrototype(rhs._kdTreePrototype)