From 7e6e17f410bc70894ba00549a54a1ec0e329d716 Mon Sep 17 00:00:00 2001
From: Groove <glm@g-truc.net>
Date: Sat, 28 Jul 2018 13:28:05 +0200
Subject: [PATCH] Fixed build

---
 test/core/core_force_pure.cpp |  6 +++---
 test/core/core_type_vec3.cpp  | 14 +++++++-------
 test/core/core_type_vec4.cpp  |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/core/core_force_pure.cpp b/test/core/core_force_pure.cpp
index f54eea34..b68235e6 100644
--- a/test/core/core_force_pure.cpp
+++ b/test/core/core_force_pure.cpp
@@ -249,10 +249,10 @@ int test_vec4_operators()
 		glm::ivec4 B(4.0f, 4.0f, 6.0f, 8.0f);
 
 		B /= A;
-		Error += B == glm::ivec4(4, 2, 2, 4) ? 0 : 1;
+		Error += B == glm::ivec4(4, 2, 2, 2) ? 0 : 1;
 
 		B /= 2;
-		Error += B == glm::ivec4(2, 1, 1, 2) ? 0 : 1;
+		Error += B == glm::ivec4(2, 1, 1, 1) ? 0 : 1;
 	}
 	{
 		glm::ivec4 B(2);
@@ -443,7 +443,7 @@ int test_vec4_simd()
 
 int main()
 {
-	int Error(0);
+	int Error = 0;
 
 	Error += test_vec4_ctor();
 	Error += test_bvec4_ctor();
diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp
index 7fd73b6a..0561afda 100644
--- a/test/core/core_type_vec3.cpp
+++ b/test/core/core_type_vec3.cpp
@@ -161,8 +161,8 @@ static int test_vec3_operators()
 	int Error = 0;
 	
 	{
-		glm::ivec3 A(1.0f);
-		glm::ivec3 B(1.0f);
+		glm::ivec3 A(1);
+		glm::ivec3 B(1);
 		bool R = A != B;
 		bool S = A == B;
 
@@ -251,10 +251,10 @@ static int test_vec3_operators()
 		Error += B == glm::ivec3(2, 1, 1) ? 0 : 1;
 	}
 	{
-		glm::ivec3 B(2.0f);
+		glm::ivec3 B(2);
 
 		B /= B.y;
-		Error += B == glm::ivec3(1.0f) ? 0 : 1;
+		Error += B == glm::ivec3(1) ? 0 : 1;
 	}
 
 	{
@@ -423,7 +423,7 @@ int test_vec3_swizzle_operators()
 		q = (u.zyx + v.zyx).zyx;    Error += (q == (u + v)) ? 0 : 1;
 		q = (u.xyz - v.xyz);        Error += (q == (u - v)) ? 0 : 1;
 		q = (u.xyz * v.xyz);        Error += (q == (u * v)) ? 0 : 1;
-		q = (u.xxx * v.xxx);        Error += (q == glm::vec3(u.x * v.x)) ? 0 : 1;
+		q = (u.xxx * v.xxx);        Error += (q == glm::ivec3(u.x * v.x)) ? 0 : 1;
 		q = (u.xyz / v.xyz);        Error += (q == (u / v)) ? 0 : 1;
 
 		// vec, swizzle binary operators
@@ -499,13 +499,13 @@ int test_vec3_swizzle_partial()
 #	if GLM_SWIZZLE == GLM_SWIZZLE_OPERATOR
 	{
 		glm::ivec3 const A(1, 2, 3);
-		glm::ivec3 B(A.xy, 3.0f);
+		glm::ivec3 B(A.xy, 3);
 		Error += A == B ? 0 : 1;
 	}
 
 	{
 		glm::ivec3 const A(1, 2, 3);
-		glm::ivec3 const B(1.0f, A.yz);
+		glm::ivec3 const B(1, A.yz);
 		Error += A == B ? 0 : 1;
 	}
 
diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp
index 28100e42..379ecccb 100644
--- a/test/core/core_type_vec4.cpp
+++ b/test/core/core_type_vec4.cpp
@@ -308,8 +308,8 @@ static int test_operators()
 	int Error = 0;
 	
 	{
-		glm::ivec4 A(1.0f);
-		glm::ivec4 B(1.0f);
+		glm::ivec4 A(1);
+		glm::ivec4 B(1);
 		bool R = A != B;
 		bool S = A == B;
 
@@ -398,10 +398,10 @@ static int test_operators()
 		Error += B == glm::ivec4(2, 1, 2, 1) ? 0 : 1;
 	}
 	{
-		glm::ivec4 B(2.0f);
+		glm::ivec4 B(2);
 
 		B /= B.y;
-		Error += B == glm::ivec4(1.0f) ? 0 : 1;
+		Error += B == glm::ivec4(1) ? 0 : 1;
 	}
 
 	{