From 5519b86003928ffc55dd346941b0a0fb0e75374e Mon Sep 17 00:00:00 2001
From: Dave Reid <mackron@gmail.com>
Date: Tue, 23 Apr 2013 09:19:57 +1000
Subject: [PATCH] Fix fvec4SIMD and fmat4x4SIMD compilation errors.

---
 glm/gtx/simd_mat4.hpp | 4 ++--
 glm/gtx/simd_mat4.inl | 6 +++---
 glm/gtx/simd_vec4.hpp | 6 +++---
 glm/gtx/simd_vec4.inl | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp
index b435b11e..5acb81bc 100644
--- a/glm/gtx/simd_mat4.hpp
+++ b/glm/gtx/simd_mat4.hpp
@@ -90,7 +90,7 @@ namespace detail
 			fvec4SIMD const & v2,
 			fvec4SIMD const & v3);
 		explicit fmat4x4SIMD(
-			tmat4x4<float> const & m);
+			mat4x4 const & m);
         explicit fmat4x4SIMD(
             __m128 const in[4]);
 
@@ -163,7 +163,7 @@ namespace detail
 
 	//! Convert a simdMat4 to a mat4.
 	//! (From GLM_GTX_simd_mat4 extension)
-	detail::tmat4x4<float> mat4_cast(
+	mat4 mat4_cast(
 		detail::fmat4x4SIMD const & x);
 
 	//! Multiply matrix x by matrix y component-wise, i.e.,
diff --git a/glm/gtx/simd_mat4.inl b/glm/gtx/simd_mat4.inl
index d6ec8ca9..a5e2b68a 100644
--- a/glm/gtx/simd_mat4.inl
+++ b/glm/gtx/simd_mat4.inl
@@ -73,7 +73,7 @@ GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
 
 GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
 (
-	tmat4x4<float> const & m
+	mat4 const & m
 )
 {
 	this->Data[0] = fvec4SIMD(m[0]);
@@ -520,12 +520,12 @@ GLM_FUNC_QUALIFIER fmat4x4SIMD const operator++
 
 }//namespace detail
 
-GLM_FUNC_QUALIFIER detail::tmat4x4<float> mat4_cast
+GLM_FUNC_QUALIFIER mat4 mat4_cast
 (
 	detail::fmat4x4SIMD const & x
 )
 {
-	GLM_ALIGN(16) detail::tmat4x4<float> Result;
+	GLM_ALIGN(16) mat4 Result;
 	_mm_store_ps(&Result[0][0], x.Data[0].Data);
 	_mm_store_ps(&Result[1][0], x.Data[1].Data);
 	_mm_store_ps(&Result[2][0], x.Data[2].Data);
diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp
index 67f10501..927e7df8 100644
--- a/glm/gtx/simd_vec4.hpp
+++ b/glm/gtx/simd_vec4.hpp
@@ -76,7 +76,7 @@ namespace detail
 		static size_type value_size();
 
 		typedef fvec4SIMD type;
-		typedef tvec4<bool> bool_type;
+		typedef tvec4<bool, highp> bool_type;
 
 #ifdef GLM_SIMD_ENABLE_XYZW_UNION
         union
@@ -108,7 +108,7 @@ namespace detail
 			float const & z, 
 			float const & w);
 		explicit fvec4SIMD(
-			tvec4<float> const & v);
+			vec4 const & v);
 
 		////////////////////////////////////////
 		//// Convertion vector constructors
@@ -161,7 +161,7 @@ namespace detail
 
 	//! Convert a simdVec4 to a vec4.
 	//! (From GLM_GTX_simd_vec4 extension)
-	detail::tvec4<float> vec4_cast(
+	vec4 vec4_cast(
 		detail::fvec4SIMD const & x);
 
 	//! Returns x if x >= 0; otherwise, it returns -x. 
diff --git a/glm/gtx/simd_vec4.inl b/glm/gtx/simd_vec4.inl
index 0b22115d..a71c550d 100644
--- a/glm/gtx/simd_vec4.inl
+++ b/glm/gtx/simd_vec4.inl
@@ -33,7 +33,7 @@ GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(fvec4SIMD const & v) :
 	Data(v.Data)
 {}
 
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(tvec4<float> const & v) :
+GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec4 const & v) :
 	Data(_mm_set_ps(v.w, v.z, v.y, v.x))
 {}
 
@@ -269,12 +269,12 @@ GLM_FUNC_QUALIFIER fvec4SIMD operator-- (fvec4SIMD const & v, int)
 
 }//namespace detail
 
-GLM_FUNC_QUALIFIER detail::tvec4<float> vec4_cast
+GLM_FUNC_QUALIFIER vec4 vec4_cast
 (
 	detail::fvec4SIMD const & x
 )
 {
-	GLM_ALIGN(16) detail::tvec4<float> Result;
+	GLM_ALIGN(16) vec4 Result;
 	_mm_store_ps(&Result[0], x.Data);
 	return Result;
 }