From fc1519c078213017854b848bfe6f635818e5e53d Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 4 May 2015 16:49:33 +0200
Subject: [PATCH] Quiet compiler

---
 interface/src/devices/DdeFaceTracker.cpp    | 3 ---
 interface/src/devices/OculusManager.cpp     | 2 +-
 libraries/octree/src/OctreeHeadlessViewer.h | 3 ++-
 libraries/physics/src/ObjectMotionState.cpp | 5 -----
 libraries/render-utils/src/FboCache.cpp     | 2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/interface/src/devices/DdeFaceTracker.cpp b/interface/src/devices/DdeFaceTracker.cpp
index b6525ffb52..1ba623ca20 100644
--- a/interface/src/devices/DdeFaceTracker.cpp
+++ b/interface/src/devices/DdeFaceTracker.cpp
@@ -136,9 +136,6 @@ struct Packet {
 
 const float STARTING_DDE_MESSAGE_TIME = 0.033f;
 
-const int FPS_TIMER_DELAY = 2000;  // ms
-const int FPS_TIMER_DURATION = 2000;  // ms
-
 #ifdef WIN32
 //  warning C4351: new behavior: elements of array 'DdeFaceTracker::_lastEyeBlinks' will be default initialized 
 //  warning C4351: new behavior: elements of array 'DdeFaceTracker::_filteredEyeBlinks' will be default initialized
diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp
index 7d719873f4..5405c76b65 100644
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@@ -461,7 +461,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
 #ifdef DEBUG
     // Ensure the frame counter always increments by exactly 1
     static int oldFrameIndex = -1;
-    assert(oldFrameIndex == -1 || oldFrameIndex == _frameIndex - 1);
+    assert(oldFrameIndex == -1 || (unsigned int)oldFrameIndex == _frameIndex - 1);
     oldFrameIndex = _frameIndex;
 #endif
 
diff --git a/libraries/octree/src/OctreeHeadlessViewer.h b/libraries/octree/src/OctreeHeadlessViewer.h
index 9a6a5c7102..2adb33d3bf 100644
--- a/libraries/octree/src/OctreeHeadlessViewer.h
+++ b/libraries/octree/src/OctreeHeadlessViewer.h
@@ -34,7 +34,8 @@ public:
 
     virtual void init();
     virtual void render(RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE,
-                            RenderArgs::RenderSide renderSide = RenderArgs::MONO) { /* swallow these */ }
+                        RenderArgs::RenderSide renderSide = RenderArgs::MONO,
+                        RenderArgs::DebugFlags renderDebugFlags = RenderArgs::RENDER_DEBUG_NONE) { /* swallow these */ }
 
     void setJurisdictionListener(JurisdictionListener* jurisdictionListener) { _jurisdictionListener = jurisdictionListener; }
 
diff --git a/libraries/physics/src/ObjectMotionState.cpp b/libraries/physics/src/ObjectMotionState.cpp
index d8eb86f0b4..350556b3a8 100644
--- a/libraries/physics/src/ObjectMotionState.cpp
+++ b/libraries/physics/src/ObjectMotionState.cpp
@@ -17,11 +17,6 @@
 #include "PhysicsHelpers.h"
 #include "PhysicsLogging.h"
 
-const float DEFAULT_FRICTION = 0.5f;
-const float MAX_FRICTION = 10.0f;
-
-const float DEFAULT_RESTITUTION = 0.5f;
-
 // origin of physics simulation in world-frame
 glm::vec3 _worldOffset(0.0f);
 
diff --git a/libraries/render-utils/src/FboCache.cpp b/libraries/render-utils/src/FboCache.cpp
index 2ca3d47bdf..de2b483573 100644
--- a/libraries/render-utils/src/FboCache.cpp
+++ b/libraries/render-utils/src/FboCache.cpp
@@ -24,7 +24,7 @@ void FboCache::lockTexture(int texture) {
     withLock(_lock, [&] {
         Q_ASSERT(_fboMap.count(texture));
         if (!_fboLocks.count(texture)) {
-            Q_ASSERT(_readyFboQueue.front()->texture() == texture);
+            Q_ASSERT(_readyFboQueue.front()->texture() == (GLuint)texture);
             _readyFboQueue.pop_front();
             _fboLocks[texture] = 1;
         } else {