Browse Source

Fixed warning tests

Christophe Riccio 8 years ago
parent
commit
a41c4d83d2
2 changed files with 11 additions and 4 deletions
  1. 2 2
      test/gtc/gtc_integer.cpp
  2. 9 2
      test/gtc/gtc_type_precision.cpp

+ 2 - 2
test/gtc/gtc_integer.cpp

@@ -188,8 +188,8 @@ namespace iround
 
 		for(float f = 0.0f; f < 3.1f; f += 0.05f)
 		{
-			int RoundFast = glm::iround(f);
-			int RoundSTD = glm::round(f);
+			int RoundFast = static_cast<int>(glm::iround(f));
+			int RoundSTD = static_cast<int>(glm::round(f));
 			Error += RoundFast == RoundSTD ? 0 : 1;
 			assert(!Error);
 		}

+ 9 - 2
test/gtc/gtc_type_precision.cpp

@@ -848,6 +848,7 @@ static int test_fvec_conversion()
 	return Error;
 }
 
+#if GLM_HAS_OPENMP
 static int test_openmp()
 {
 	std::vector<glm::u8vec3> VectorA(1000);
@@ -868,11 +869,16 @@ static int test_openmp()
 
 	return 0;
 }
+#endif//GLM_HAS_OPENMP
 
 int main()
 {
-	int Error(0);
-	Error += test_openmp();
+	int Error = 0;
+
+#	if GLM_HAS_OPENMP
+		Error += test_openmp();
+#	endif//
+
 	Error += test_scalar_size();
 	Error += test_fvec_size();
 	Error += test_fvec_precision();
@@ -886,5 +892,6 @@ int main()
 	Error += test_dmat_size();
 	Error += test_quat_size();
 	Error += test_quat_precision();
+
 	return Error;
 }