From 2b17a9085932861a76e962314184332309c045e0 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 8 Feb 2014 20:49:34 +0100 Subject: [PATCH] Fixed declaration and definition mismatch --- glm/detail/func_exponential.inl | 10 ++-------- glm/gtx/integer.hpp | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/glm/detail/func_exponential.inl b/glm/detail/func_exponential.inl index 20fa45c92..08f3ba4c8 100644 --- a/glm/detail/func_exponential.inl +++ b/glm/detail/func_exponential.inl @@ -128,10 +128,7 @@ namespace detail //exp2, ln2 = 0.69314718055994530941723212145818f template - GLM_FUNC_QUALIFIER genType exp2 - ( - genType const & x - ) + GLM_FUNC_QUALIFIER genType exp2(genType const & x) { GLM_STATIC_ASSERT( std::numeric_limits::is_iec559, @@ -144,10 +141,7 @@ namespace detail // log2, ln2 = 0.69314718055994530941723212145818f template - GLM_FUNC_QUALIFIER genType log2 - ( - genType const & x - ) + GLM_FUNC_QUALIFIER genType log2(genType x) { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "GLM core 'log2' only accept floating-point inputs. Include for additional integer support."); diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index b02e9260f..9bb4de53e 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -61,7 +61,7 @@ namespace glm //! Returns the log2 of x. Can be reliably using to compute mipmap count from the texture size. //! From GLM_GTX_integer extension. template - genIUType log2(genIUType const & x); + genIUType log2(genIUType x); //! Returns the floor log2 of x. //! From GLM_GTX_integer extension.