From 246609b453e8c47f3cfc1750d284a0a3837d01f0 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Sat, 22 Nov 2014 23:26:18 +0100
Subject: [PATCH] Fix build

---
 CMakeLists.txt              | 1 -
 glm/detail/func_integer.inl | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index daf45035..818af5b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,6 @@ elseif(GLM_TEST_ENABLE_SIMD_AVX2)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxAVX2)
 	elseif(MSVC)
-		message("AVX2")
 		add_definitions(/arch:AVX2)
 	endif()
 elseif(GLM_TEST_ENABLE_SIMD_AVX)
diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl
index c7ee7e13..c2c07563 100644
--- a/glm/detail/func_integer.inl
+++ b/glm/detail/func_integer.inl
@@ -133,7 +133,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, glm::precision P, template <class, glm::precision> class vecType>
+	template <typename T, glm::precision P, template <typename, glm::precision> class vecType>
 	struct compute_findMSB_step_vec<T, P, vecType, false>
 	{
 		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, T)
@@ -142,7 +142,7 @@ namespace detail
 		}
 	};
 
-	template <typename T, glm::precision P, template <class, glm::precision> class vecType, std::size_t>
+	template <typename T, glm::precision P, template <typename, glm::precision> class vecType, int>
 	struct compute_findMSB_vec
 	{
 		GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & vec)
@@ -178,7 +178,7 @@ namespace detail
 		template <typename T, glm::precision P, template <class, glm::precision> class vecType>
 		struct compute_findMSB_vec<T, P, vecType, 32>
 		{
-			GLM_FUNC_QUALIFIER static int call(vecType<T, P> const & x)
+			GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & x)
 			{
 				return detail::functor1<int, T, P, vecType>::call(compute_findMSB_32, x);
 			}
@@ -187,7 +187,7 @@ namespace detail
 		template <typename T, glm::precision P, template <class, glm::precision> class vecType>
 		struct compute_findMSB_vec<T, P, vecType, 64>
 		{
-			GLM_FUNC_QUALIFIER static int call(vecType<T, P> const & x)
+			GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & x)
 			{
 				return detail::functor1<int, T, P, vecType>::call(compute_findMSB_64, x);
 			}