From 45c4fbeb65af1968852738b887ec1ad8f01c50f1 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Sun, 26 Oct 2014 00:54:36 +0200
Subject: [PATCH] Fixed build

---
 glm/gtc/bitfield.hpp |  2 ++
 glm/gtc/bitfield.inl | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/glm/gtc/bitfield.hpp b/glm/gtc/bitfield.hpp
index bd98bf51..322d73a8 100644
--- a/glm/gtc/bitfield.hpp
+++ b/glm/gtc/bitfield.hpp
@@ -42,6 +42,8 @@
 #include "../detail/setup.hpp"
 #include "../detail/precision.hpp"
 #include "../detail/type_int.hpp"
+#include "../detail/_vectorize.hpp"
+#include <limits>
 
 #if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
 #	pragma message("GLM: GLM_GTC_bitfield extension included")
diff --git a/glm/gtc/bitfield.inl b/glm/gtc/bitfield.inl
index 7b0b027d..ae70dd92 100644
--- a/glm/gtc/bitfield.inl
+++ b/glm/gtc/bitfield.inl
@@ -256,17 +256,17 @@ namespace detail
 		return detail::functor1<int, int, P, vecType>::call(mask, v);
 	}
 
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType bitRotateRight(genType In, int Shift)
+	template <typename genIType>
+	GLM_FUNC_QUALIFIER genIType bitRotateRight(genIType In, int Shift)
 	{
-		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_integer, "'bitRotateRight' only accept integer values");
+		GLM_STATIC_ASSERT(std::numeric_limits<genIType>::is_integer, "'bitRotateRight' only accept integer values");
 
-		int const BitSize = static_cast<genType>(sizeof(T) * 8);
-		return (In << static_cast<T>(Shift)) | (In >> static_cast<T>(BitSize - Shift));
+		int const BitSize = static_cast<genIType>(sizeof(genIType) * 8);
+		return (In << static_cast<genIType>(Shift)) | (In >> static_cast<genIType>(BitSize - Shift));
 	}
 
 	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> bitRotateRight(vecType<T, P> const & Value, int Shift)
+	GLM_FUNC_QUALIFIER vecType<T, P> bitRotateRight(vecType<T, P> const & In, int Shift)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitRotateRight' only accept integer values");
 
@@ -274,13 +274,13 @@ namespace detail
 		return (In << static_cast<T>(Shift)) | (In >> static_cast<T>(BitSize - Shift));
 	}
 
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType bitRotateLeft(genType In, int Shift)
+	template <typename genIType>
+	GLM_FUNC_QUALIFIER genIType bitRotateLeft(genIType In, int Shift)
 	{
-		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_integer, "'bitRotateLeft' only accept integer values");
+		GLM_STATIC_ASSERT(std::numeric_limits<genIType>::is_integer, "'bitRotateLeft' only accept integer values");
 
-		int const BitSize = static_cast<genType>(sizeof(T) * 8);
-		return (In >> static_cast<genType>(Shift)) | (In << static_cast<genType>(BitSize - Shift));
+		int const BitSize = static_cast<genIType>(sizeof(genIType) * 8);
+		return (In >> static_cast<genIType>(Shift)) | (In << static_cast<genIType>(BitSize - Shift));
 	}
 
 	template <typename T, precision P, template <typename, precision> class vecType>