From e55eb1e08b5c7ee1d293a6b1cf8b063f34bc9fb4 Mon Sep 17 00:00:00 2001
From: Jesse Talavera-Greenberg <jessetalavera@aol.com>
Date: Wed, 7 Oct 2015 16:12:45 -0400
Subject: [PATCH] Removed ambiguity in fmat4x4 constructor

---
 glm/gtx/simd_mat4.inl      | 4 ++--
 test/gtx/gtx_simd_mat4.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/glm/gtx/simd_mat4.inl b/glm/gtx/simd_mat4.inl
index 9b48289f..c436ab1f 100644
--- a/glm/gtx/simd_mat4.inl
+++ b/glm/gtx/simd_mat4.inl
@@ -62,8 +62,8 @@ GLM_FUNC_QUALIFIER fvec4SIMD const & fmat4x4SIMD::operator[]
 }
 
 #ifdef GLM_STATIC_CONST_MEMBERS
-	const fmat4x4SIMD fmat4x4SIMD::ZERO(0);
-	const fmat4x4SIMD fmat4x4SIMD::IDENTITY(1);
+	const fmat4x4SIMD fmat4x4SIMD::ZERO(static_cast<float>(0));
+	const fmat4x4SIMD fmat4x4SIMD::IDENTITY(static_cast<float>(1));
 #endif
 
 //////////////////////////////////////////////////////////////
diff --git a/test/gtx/gtx_simd_mat4.cpp b/test/gtx/gtx_simd_mat4.cpp
index dce607b6..6a9a42df 100644
--- a/test/gtx/gtx_simd_mat4.cpp
+++ b/test/gtx/gtx_simd_mat4.cpp
@@ -256,8 +256,8 @@ int test_compute_gtx()
 int test_static_const() {
 	int Error(0);
 
-	Error += glm::simdMat4(1) == glm::simdMat4::IDENTITY ? 0 : 1;
-	Error += glm::simdMat4(0) == glm::simdMat4::ZERO ? 0 : 1;
+	Error += glm::mat4_cast(glm::simdMat4(static_cast<float>(1))) == glm::mat4_cast(glm::simdMat4::IDENTITY) ? 0 : 1;
+	Error += glm::mat4_cast(glm::simdMat4(static_cast<float>(0))) == glm::mat4_cast(glm::simdMat4::ZERO) ? 0 : 1;
 
 	return Error;
 }