Browse Source

Fix build

Christophe Riccio 11 years ago
parent
commit
246609b453
2 changed files with 4 additions and 5 deletions
  1. 0 1
      CMakeLists.txt
  2. 4 4
      glm/detail/func_integer.inl

+ 0 - 1
CMakeLists.txt

@@ -78,7 +78,6 @@ elseif(GLM_TEST_ENABLE_SIMD_AVX2)
 	elseif(GLM_USE_INTEL)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxAVX2)
 		add_definitions(/QxAVX2)
 	elseif(MSVC)
 	elseif(MSVC)
-		message("AVX2")
 		add_definitions(/arch:AVX2)
 		add_definitions(/arch:AVX2)
 	endif()
 	endif()
 elseif(GLM_TEST_ENABLE_SIMD_AVX)
 elseif(GLM_TEST_ENABLE_SIMD_AVX)

+ 4 - 4
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>
 	struct compute_findMSB_step_vec<T, P, vecType, false>
 	{
 	{
 		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, T)
 		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
 	struct compute_findMSB_vec
 	{
 	{
 		GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & 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>
 		template <typename T, glm::precision P, template <class, glm::precision> class vecType>
 		struct compute_findMSB_vec<T, P, vecType, 32>
 		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);
 				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>
 		template <typename T, glm::precision P, template <class, glm::precision> class vecType>
 		struct compute_findMSB_vec<T, P, vecType, 64>
 		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);
 				return detail::functor1<int, T, P, vecType>::call(compute_findMSB_64, x);
 			}
 			}