Browse Source

Fixed make_vec* functions for XCode 4

Christophe Riccio 14 years ago
parent
commit
1cf66a25d9
1 changed files with 6 additions and 5 deletions
  1. 6 5
      glm/gtc/type_ptr.hpp

+ 6 - 5
glm/gtc/type_ptr.hpp

@@ -15,6 +15,7 @@
 
 
 // Dependency:
 // Dependency:
 #include "../glm.hpp"
 #include "../glm.hpp"
+#include <cstring>
 
 
 #if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #if(defined(GLM_MESSAGES) && !defined(glm_ext))
 #	pragma message("GLM: GLM_GTC_type_ptr extension included")
 #	pragma message("GLM: GLM_GTC_type_ptr extension included")
@@ -420,23 +421,23 @@ namespace glm
 		template<typename T>
 		template<typename T>
 		inline detail::tmat2x2<T> make_mat2(T const * const ptr)
 		inline detail::tmat2x2<T> make_mat2(T const * const ptr)
 		{
 		{
-			return make_mat2x2(Result);
+			return make_mat2x2(ptr);
 		}
 		}
         
         
 		//! Build a matrix from a pointer.
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
 		template<typename T>
-		inline detail::tmat3<T> make_mat3(T const * const ptr)
+		inline detail::tmat3x3<T> make_mat3(T const * const ptr)
 		{
 		{
-			return make_mat3x3(Result);
+			return make_mat3x3(ptr);
 		}
 		}
 		
 		
 		//! Build a matrix from a pointer.
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
 		template<typename T>
-		inline detail::tmat4<T> make_mat4(T const * const ptr)
+		inline detail::tmat4x4<T> make_mat4(T const * const ptr)
 		{
 		{
-			return make_mat4x4(Result);
+			return make_mat4x4(ptr);
 		}
 		}
         
         
 		///@}
 		///@}