From b51fe09cb9baabea50c9a266a85c4b686840c8b1 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 30 Sep 2013 02:05:13 +0200 Subject: [PATCH] Fixed build --- glm/core/func_exponential.inl | 2 +- glm/core/func_vector_relational.inl | 2 ++ glm/gtx/bit.inl | 16 ++-------------- test/core/core_type_mat4x4.cpp | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/glm/core/func_exponential.inl b/glm/core/func_exponential.inl index acf4d449..7738df02 100644 --- a/glm/core/func_exponential.inl +++ b/glm/core/func_exponential.inl @@ -100,7 +100,7 @@ namespace glm namespace detail { - template + template struct compute_log2 { template diff --git a/glm/core/func_vector_relational.inl b/glm/core/func_vector_relational.inl index e229bf6b..b1131fd7 100644 --- a/glm/core/func_vector_relational.inl +++ b/glm/core/func_vector_relational.inl @@ -26,6 +26,8 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// +#include + namespace glm { template class vecType> diff --git a/glm/gtx/bit.inl b/glm/gtx/bit.inl index 598c78fc..53ac2954 100644 --- a/glm/gtx/bit.inl +++ b/glm/gtx/bit.inl @@ -23,8 +23,8 @@ namespace glm template GLM_FUNC_QUALIFIER genIType extractField ( - float const & value, - genIType const & first, + float const & value, + genIType const & first, genIType const & count ) { @@ -32,18 +32,6 @@ namespace glm return (detail::uif32(value).i << first) >> ((sizeof(float) << 3) - count); } - template - GLM_FUNC_QUALIFIER genIType extractField - ( - double const & value, - genIType const & first, - genIType const & count - ) - { - assert(first + count < sizeof(double)); - return (detail::uif64(value).i << first) >> ((sizeof(double) << genIType(3)) - count); - } - template GLM_FUNC_QUALIFIER genIUType extractField ( diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index bf1cf2dd..9801e1a6 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -142,7 +142,7 @@ int test_ctr() {8, 9, 10, 11}, {12, 13, 14, 15}}; - glm::mat4 m4{m3}; + //glm::mat4 m4{m3}; /* std::vector v{