Browse Source

Merge branch '0.9.2' of ssh://ogl-math.git.sourceforge.net/gitroot/ogl-math/ogl-math into 0.9.2

Christophe Riccio 14 years ago
parent
commit
b8de01d411
3 changed files with 4 additions and 3 deletions
  1. BIN
      doc/glm-0.9.2.pdf
  2. 1 1
      glm/core/setup.hpp
  3. 3 2
      glm/gtx/integer.inl

BIN
doc/glm-0.9.2.pdf


+ 1 - 1
glm/core/setup.hpp

@@ -17,7 +17,7 @@
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_PATCH			2
-#define GLM_VERSION_REVISION		1
+#define GLM_VERSION_REVISION		2
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

+ 3 - 2
glm/gtx/integer.inl

@@ -49,9 +49,10 @@ namespace integer
 	template <typename genType>
     GLM_FUNC_QUALIFIER genType factorial(genType const & x)
     {
+		genType Temp = x;
         genType Result;
-        for(Result = 1; x > 1; --x)
-            Result *= x;
+        for(Result = 1; Temp > 1; --Temp)
+            Result *= Temp;
         return Result;
     }