Browse Source

Updated function qualifier with GLM macro

Christophe Riccio 14 years ago
parent
commit
6595dfab86
1 changed files with 15 additions and 15 deletions
  1. 15 15
      glm/gtc/type_ptr.hpp

+ 15 - 15
glm/gtc/type_ptr.hpp

@@ -298,7 +298,7 @@ namespace glm
 		//! Build a vector from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tvec2<T> make_vec2(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tvec2<T> make_vec2(T const * const ptr)
 		{
 			detail::tvec2<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tvec2<T>));
@@ -308,7 +308,7 @@ namespace glm
 		//! Build a vector from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tvec3<T> make_vec3(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tvec3<T> make_vec3(T const * const ptr)
 		{
 			detail::tvec3<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tvec3<T>));
@@ -318,7 +318,7 @@ namespace glm
 		//! Build a vector from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tvec4<T> make_vec4(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tvec4<T> make_vec4(T const * const ptr)
 		{
 			detail::tvec4<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tvec4<T>));
@@ -328,7 +328,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat2x2<T> make_mat2x2(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat2x2<T> make_mat2x2(T const * const ptr)
 		{
 			detail::tmat2x2<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat2x2<T>));
@@ -338,7 +338,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat2x3<T> make_mat2x3(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat2x3<T> make_mat2x3(T const * const ptr)
 		{
 			detail::tmat2x3<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat2x3<T>));
@@ -348,7 +348,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat2x4<T> make_mat2x4(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat2x4<T> make_mat2x4(T const * const ptr)
 		{
 			detail::tmat2x4<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat2x4<T>));
@@ -358,7 +358,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat3x2<T> make_mat3x2(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat3x2<T> make_mat3x2(T const * const ptr)
 		{
 			detail::tmat3x2<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat3x2<T>));
@@ -368,7 +368,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat3x3<T> make_mat3x3(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat3x3<T> make_mat3x3(T const * const ptr)
 		{
 			detail::tmat3x3<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat3x3<T>));
@@ -378,7 +378,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat3x4<T> make_mat3x4(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat3x4<T> make_mat3x4(T const * const ptr)
 		{
 			detail::tmat3x4<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat3x4<T>));
@@ -389,7 +389,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat4x2<T> make_mat4x2(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat4x2<T> make_mat4x2(T const * const ptr)
 		{
 			detail::tmat4x2<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat4x2<T>));
@@ -399,7 +399,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat4x3<T> make_mat4x3(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat4x3<T> make_mat4x3(T const * const ptr)
 		{
 			detail::tmat4x3<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat4x3<T>));
@@ -409,7 +409,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat4x4<T> make_mat4x4(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat4x4<T> make_mat4x4(T const * const ptr)
 		{
 			detail::tmat4x4<T> Result;
 			memcpy(value_ptr(Result), ptr, sizeof(detail::tmat4x4<T>));
@@ -419,7 +419,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat2x2<T> make_mat2(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat2x2<T> make_mat2(T const * const ptr)
 		{
 			return make_mat2x2(ptr);
 		}
@@ -427,7 +427,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat3x3<T> make_mat3(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat3x3<T> make_mat3(T const * const ptr)
 		{
 			return make_mat3x3(ptr);
 		}
@@ -435,7 +435,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat4x4<T> make_mat4(T const * const ptr)
+		GLM_FUNC_QUALIFIER detail::tmat4x4<T> make_mat4(T const * const ptr)
 		{
 			return make_mat4x4(ptr);
 		}