From 6cfa57cf864baf3228c6f6a66c8239c0a8fb5786 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 26 Mar 2017 23:55:15 +0200 Subject: [PATCH] Fixed build error min and max specializations with integer #616 --- glm/detail/func_common.inl | 4 ++-- readme.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl index 327b058a..00131eff 100644 --- a/glm/detail/func_common.inl +++ b/glm/detail/func_common.inl @@ -514,7 +514,7 @@ namespace detail template class vecType> GLM_FUNC_QUALIFIER vecType min(vecType const & a, T b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'min' only accept floating-point inputs for the interpolator a"); + GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_UNRESTRICTED_GENTYPE, "'min' only accept floating-point or integer inputs"); return detail::compute_min_vector::value>::call(a, vecType(b)); } @@ -528,7 +528,7 @@ namespace detail template class vecType> GLM_FUNC_QUALIFIER vecType max(vecType const & a, T b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_UNRESTRICTED_GENTYPE, "'max' only accept floating-point inputs for the interpolator a"); + GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_UNRESTRICTED_GENTYPE, "'max' only accept floating-point or integer inputs"); return detail::compute_max_vector::value>::call(a, vecType(b)); } diff --git a/readme.md b/readme.md index e07acb4b..aa30fc4c 100644 --- a/readme.md +++ b/readme.md @@ -55,6 +55,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ##### Fixes: - Fixed Clang version detection from source #608 - Fixed packF3x9_E1x5 exponent packing #614 +- Fixed build error min and max specializations with integer #616 #### [GLM 0.9.8.4](https://github.com/g-truc/glm/releases/tag/0.9.8.4) - 2017-01-22 ##### Fixes: