Browse Source

Merge pull request #41 from Kangz/0.9.4

Fix a warning in func_integer.inl, issue #41
Christophe Riccio 13 years ago
parent
commit
e1aa3142b2
1 changed files with 1 additions and 1 deletions
  1. 1 1
      glm/core/func_integer.inl

+ 1 - 1
glm/core/func_integer.inl

@@ -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>