From 0ad09d6dad994817b6d8ece4b1c6dacec9c17fc3 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 26 Aug 2016 19:18:00 +0100
Subject: [PATCH] Fixed unused variable warnings

---
 include/osg/Referenced | 1 +
 src/osg/Callback.cpp   | 2 +-
 src/osg/Referenced.cpp | 7 ++-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/include/osg/Referenced b/include/osg/Referenced
index 8eef3d358..c807c295e 100644
--- a/include/osg/Referenced
+++ b/include/osg/Referenced
@@ -47,6 +47,7 @@ class OSG_EXPORT Referenced
 
         Referenced();
 
+        /// deprecated, Referenced is now always uses thread safe ref/unref, use default Refernced() constructor instead
         explicit Referenced(bool threadSafeRefUnref);
 
         Referenced(const Referenced&);
diff --git a/src/osg/Callback.cpp b/src/osg/Callback.cpp
index f8e873b8d..064da571a 100644
--- a/src/osg/Callback.cpp
+++ b/src/osg/Callback.cpp
@@ -54,7 +54,7 @@ bool CallbackObject::run(osg::Object* object, osg::Object* data)
     return run(object,inputParameters, outputParameters);
 }
 
-bool CallbackObject::run(osg::Object* object, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
+bool CallbackObject::run(osg::Object* object, osg::Parameters& /*inputParameters*/, osg::Parameters& /*outputParameters*/) const
 {
     OSG_NOTICE<<"CallbackObject::run(object="<<object<<")"<<std::endl;
     return false;
diff --git a/src/osg/Referenced.cpp b/src/osg/Referenced.cpp
index 07a10933f..11d4601c7 100644
--- a/src/osg/Referenced.cpp
+++ b/src/osg/Referenced.cpp
@@ -143,7 +143,7 @@ Referenced::Referenced():
 
 }
 
-Referenced::Referenced(bool threadSafeRefUnref):
+Referenced::Referenced(bool /*threadSafeRefUnref*/):
 #if defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS)
     _observerSet(0),
     _refCount(0)
@@ -154,10 +154,7 @@ Referenced::Referenced(bool threadSafeRefUnref):
 #endif
 {
 #if !defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS)
-#ifndef ENFORCE_THREADSAFE
-    if (threadSafeRefUnref)
-#endif
-        _refMutex = new OpenThreads::Mutex;
+    _refMutex = new OpenThreads::Mutex;
 #endif
 
 #ifdef DEBUG_OBJECT_ALLOCATION_DESTRUCTION