From 9436d2922fb750fb18681e10044504a319c17929 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Tue, 22 Sep 2015 21:18:04 -0700
Subject: [PATCH] more warnings fixes

---
 libraries/render-utils/src/GLEscrow.cpp           | 5 ++++-
 libraries/shared/src/MatrixStack.cpp              | 5 ++++-
 libraries/shared/src/shared/ReadWriteLockable.cpp | 5 ++++-
 tests/entities/src/main.cpp                       | 4 ----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libraries/render-utils/src/GLEscrow.cpp b/libraries/render-utils/src/GLEscrow.cpp
index 253af35d92..486e9f7b5e 100644
--- a/libraries/render-utils/src/GLEscrow.cpp
+++ b/libraries/render-utils/src/GLEscrow.cpp
@@ -6,4 +6,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "GLEscrow.h"
+// FIXME - I don't think we need to actually include this in a CPP, all callers will simply
+//         use the header file and the result will be the code will be expanded inline.
+//         however, including it in a CPP file produces a linker warning on windows.
+//#include "GLEscrow.h"
diff --git a/libraries/shared/src/MatrixStack.cpp b/libraries/shared/src/MatrixStack.cpp
index 2a2817a413..f6ad6f3ca7 100644
--- a/libraries/shared/src/MatrixStack.cpp
+++ b/libraries/shared/src/MatrixStack.cpp
@@ -6,4 +6,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "MatrixStack.h"
+// FIXME - I don't think we need to actually include this in a CPP, all callers will simply
+//         use the header file and the result will be the code will be expanded inline.
+//         however, including it in a CPP file produces a linker warning on windows.
+//#include "MatrixStack.h"
diff --git a/libraries/shared/src/shared/ReadWriteLockable.cpp b/libraries/shared/src/shared/ReadWriteLockable.cpp
index 04b71cf64f..eb964ad1aa 100644
--- a/libraries/shared/src/shared/ReadWriteLockable.cpp
+++ b/libraries/shared/src/shared/ReadWriteLockable.cpp
@@ -6,5 +6,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ReadWriteLockable.h"
+// FIXME - I don't think we need to actually include this in a CPP, all callers will simply
+//         use the header file and the result will be the code will be expanded inline.
+//         however, including it in a CPP file produces a linker warning on windows.
+//#include "ReadWriteLockable.h"
 
diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp
index 8eac7e931f..1b150ee3f5 100644
--- a/tests/entities/src/main.cpp
+++ b/tests/entities/src/main.cpp
@@ -93,10 +93,6 @@ template <typename T>
 void testByteCountCoded() {
     testByteCountCodedStable<T>(0);
     testByteCountCodedStable<T>(1);
-    // These two can't possibly be right.  TODO: figure out what was being tested, here
-    // testByteCountCodedStable<T>(1 << 8*sizeof(T));
-    // testByteCountCodedStable<T>(std::numeric_limits<T>::max() >> 8*sizeof(T));
-    testByteCountCodedStable<T>(std::numeric_limits<T>::max() >> 8);
     testByteCountCodedStable<T>(std::numeric_limits<T>::max() >> 1);
     testByteCountCodedStable<T>(std::numeric_limits<T>::max());
 }