Merge pull request #41 from Kangz/0.9.4

Fix a warning in func_integer.inl, issue #41
This commit is contained in:
Christophe Riccio 2013-01-31 06:06:31 -08:00
commit e1aa3142b2

View File

@ -103,7 +103,7 @@ namespace glm
if(x > y) if(x > y)
return genUType(detail::highp_int_t(x) - detail::highp_int_t(y)); return genUType(detail::highp_int_t(x) - detail::highp_int_t(y));
else else
return genUType(detail::highp_int_t(1) << detail::highp_int_t(32) + detail::highp_int_t(x) - detail::highp_int_t(y)); return genUType((detail::highp_int_t(1) << detail::highp_int_t(32)) + detail::highp_int_t(x) - detail::highp_int_t(y));
} }
template <typename T> template <typename T>