Merge branch '0.9.7'

This commit is contained in:
Christophe Riccio 2016-07-14 16:41:20 +02:00
commit 0698e6537a

View File

@ -6,7 +6,7 @@
namespace glm{ namespace glm{
namespace detail namespace detail
{ {
template <template <typename, precision> class vecType, typename T, precision P, bool Aligned> template <template <typename, precision> class vecType, typename T, precision P>
struct compute_length2 struct compute_length2
{ {
GLM_FUNC_QUALIFIER static T call(vecType<T, P> const & v) GLM_FUNC_QUALIFIER static T call(vecType<T, P> const & v)
@ -27,7 +27,7 @@ namespace detail
GLM_FUNC_QUALIFIER T length2(vecType<T, P> const & v) GLM_FUNC_QUALIFIER T length2(vecType<T, P> const & v)
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'length2' accepts only floating-point inputs"); GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'length2' accepts only floating-point inputs");
return detail::compute_length2<vecType, T, P, detail::is_aligned<P>::value>::call(v); return detail::compute_length2<vecType, T, P>::call(v);
} }
template <typename T> template <typename T>