From 6323728d7a5092073ec445663ff2d8ea276ad8b1 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 6 Nov 2015 16:56:48 -0800
Subject: [PATCH] Added perfect forwarding of arguments

---
 .../src/input-plugins/SixenseManager.cpp              |  4 +++-
 .../src/input-plugins/SixenseSupportOSX.cpp           | 11 +++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libraries/input-plugins/src/input-plugins/SixenseManager.cpp b/libraries/input-plugins/src/input-plugins/SixenseManager.cpp
index 9340cbf950..3085b377f0 100644
--- a/libraries/input-plugins/src/input-plugins/SixenseManager.cpp
+++ b/libraries/input-plugins/src/input-plugins/SixenseManager.cpp
@@ -12,7 +12,7 @@
 #include "SixenseManager.h"
 
 #ifdef HAVE_SIXENSE
-#include "sixense.h"
+#include <sixense.h>
 #endif
 
 #include <QCoreApplication>
@@ -28,6 +28,8 @@
 #include <SettingHandle.h>
 #include <UserActivityLogger.h>
 
+#include "InputPluginsLogging.h"
+
 static const unsigned int BUTTON_0 = 1U << 0; // the skinny button between 1 and 2
 static const unsigned int BUTTON_1 = 1U << 5;
 static const unsigned int BUTTON_2 = 1U << 6;
diff --git a/libraries/input-plugins/src/input-plugins/SixenseSupportOSX.cpp b/libraries/input-plugins/src/input-plugins/SixenseSupportOSX.cpp
index 4a4eab2ee1..378c99de76 100644
--- a/libraries/input-plugins/src/input-plugins/SixenseSupportOSX.cpp
+++ b/libraries/input-plugins/src/input-plugins/SixenseSupportOSX.cpp
@@ -9,11 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+// Mock implementation of sixense.h to hide dynamic linking on OS X
 #if defined(__APPLE__) && defined(HAVE_SIXENSE)
-#include "sixense.h"
+#include <type_traits>
+
+#include <sixense.h>
 
 #include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
 #include <QtCore/QLibrary>
 
 #include "InputPluginsLogging.h"
@@ -22,8 +24,9 @@ using Library = std::unique_ptr<QLibrary>;
 static Library SIXENSE;
 
 struct Callable {
-    template<typename... Args> int operator() (Args... args){
-        return reinterpret_cast<int(*)(Args...)>(function)(args...);
+    template<typename... Args>
+    int operator() (Args&&... args){
+        return reinterpret_cast<int(*)(Args...)>(function)(std::forward<Args>(args)...);
     }
     QFunctionPointer function;
 };