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 class vecType> + template class vecType> struct compute_findMSB_step_vec { GLM_FUNC_QUALIFIER static vecType call(vecType const & x, T) @@ -142,7 +142,7 @@ namespace detail } }; - template class vecType, std::size_t> + template class vecType, int> struct compute_findMSB_vec { GLM_FUNC_QUALIFIER static vecType call(vecType const & vec) @@ -178,7 +178,7 @@ namespace detail template class vecType> struct compute_findMSB_vec { - GLM_FUNC_QUALIFIER static int call(vecType const & x) + GLM_FUNC_QUALIFIER static vecType call(vecType const & x) { return detail::functor1::call(compute_findMSB_32, x); } @@ -187,7 +187,7 @@ namespace detail template class vecType> struct compute_findMSB_vec { - GLM_FUNC_QUALIFIER static int call(vecType const & x) + GLM_FUNC_QUALIFIER static vecType call(vecType const & x) { return detail::functor1::call(compute_findMSB_64, x); }