From 1afd3ab712aab3e673dcdd2162ee58d2dd175deb Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Thu, 13 Feb 2014 17:07:57 -0800
Subject: [PATCH] Fixes for OS X warnings.

---
 interface/src/avatar/MyAvatar.cpp        | 1 -
 interface/src/renderer/GeometryCache.cpp | 6 ++++--
 interface/src/renderer/GeometryCache.h   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 0e2625bf0f..de2459d9ee 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1002,7 +1002,6 @@ void MyAvatar::updateCollisionWithAvatars(float deltaTime) {
                 avatar->getPosition(), theirCapsuleRadius, theirCapsuleHeight, penetration)) {
                 // move the avatar out by half the penetration
                 setPosition(_position - 0.5f * penetration);
-                glm::vec3 pushOut = 0.5f * penetration;
             }
         }
     }
diff --git a/interface/src/renderer/GeometryCache.cpp b/interface/src/renderer/GeometryCache.cpp
index c02f69b8fb..78cc657018 100644
--- a/interface/src/renderer/GeometryCache.cpp
+++ b/interface/src/renderer/GeometryCache.cpp
@@ -300,6 +300,8 @@ QSharedPointer<NetworkGeometry> GeometryCache::getGeometry(const QUrl& url, cons
     return geometry;
 }
 
+const float NetworkGeometry::NO_HYSTERESIS = -1.0f;
+
 NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGeometry>& fallback,
         const QVariantHash& mapping, const QUrl& textureBase) :
     _request(url),
@@ -307,9 +309,9 @@ NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGe
     _mapping(mapping),
     _textureBase(textureBase.isValid() ? textureBase : url),
     _fallback(fallback),
-    _attempts(0),
     _startedLoading(false),
-    _failedToLoad(false) {
+    _failedToLoad(false),
+    _attempts(0) {
     
     if (!url.isValid()) {
         return;
diff --git a/interface/src/renderer/GeometryCache.h b/interface/src/renderer/GeometryCache.h
index 110e2eec4c..ef53fe9c3e 100644
--- a/interface/src/renderer/GeometryCache.h
+++ b/interface/src/renderer/GeometryCache.h
@@ -63,7 +63,7 @@ class NetworkGeometry : public QObject {
 public:
     
     /// A hysteresis value indicating that we have no state memory.
-    static const float NO_HYSTERESIS = -1.0f;
+    static const float NO_HYSTERESIS;
     
     NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGeometry>& fallback,
         const QVariantHash& mapping = QVariantHash(), const QUrl& textureBase = QUrl());