From eb21b9c5d778675bbc431f1377d2b03ff7bf9072 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 2 May 2016 17:18:57 -0700
Subject: [PATCH] OSX warnings

---
 libraries/avatars/src/AvatarData.cpp   | 1 -
 libraries/gl/src/gl/OglplusHelpers.cpp | 6 +++---
 libraries/gl/src/gl/OglplusHelpers.h   | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 290aaff820..7db55d50e0 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -45,7 +45,6 @@ const glm::vec3 DEFAULT_LOCAL_AABOX_CORNER(-0.5f);
 const glm::vec3 DEFAULT_LOCAL_AABOX_SCALE(1.0f);
 
 const QString AvatarData::FRAME_NAME = "com.highfidelity.recording.AvatarData";
-static std::once_flag frameTypeRegistration;
 
 AvatarData::AvatarData() :
     SpatiallyNestable(NestableType::Avatar, QUuid()),
diff --git a/libraries/gl/src/gl/OglplusHelpers.cpp b/libraries/gl/src/gl/OglplusHelpers.cpp
index 220ea86646..5bf0298593 100644
--- a/libraries/gl/src/gl/OglplusHelpers.cpp
+++ b/libraries/gl/src/gl/OglplusHelpers.cpp
@@ -334,7 +334,7 @@ public:
 
     /// Returns the instructions for rendering of faces
     DrawingInstructions Instructions(PrimitiveType primitive) const {
-        DrawingInstructions instr = this->MakeInstructions();
+        DrawingInstructions instr = MakeInstructions();
         DrawOperation operation;
         operation.method = DrawOperation::Method::DrawElements;
         operation.mode = primitive;
@@ -342,8 +342,8 @@ public:
         operation.count = _prim_count * 3;
         operation.restart_index = DrawOperation::NoRestartIndex();
         operation.phase = 0;
-        this->AddInstruction(instr, operation);
-        return std::move(instr);
+        AddInstruction(instr, operation);
+        return instr;
     }
 
     /// Returns the instructions for rendering of faces
diff --git a/libraries/gl/src/gl/OglplusHelpers.h b/libraries/gl/src/gl/OglplusHelpers.h
index b599e8270d..afb06069b8 100644
--- a/libraries/gl/src/gl/OglplusHelpers.h
+++ b/libraries/gl/src/gl/OglplusHelpers.h
@@ -28,7 +28,11 @@
 #ifdef _WIN32
 #pragma warning(push)
 #pragma warning( disable : 4068 )
+#elif defined(Q_OS_MAC)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpessimizing-move"
 #endif
+
 #include <oglplus/gl.hpp>
 
 #include <oglplus/all.hpp>
@@ -40,6 +44,8 @@
 
 #ifdef _WIN32
 #pragma warning(pop)
+#elif defined(Q_OS_MAC)
+#pragma clang diagnostic pop
 #endif
 
 #include "NumericalConstants.h"