mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed warning tests

Browse Source
This commit is contained in:
Christophe Riccio 2017-08-07 14:34:28 +02:00
parent 336a949cf8
commit a41c4d83d2
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/gtc/gtc_integer.cpp
View File

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

11
test/gtc/gtc_type_precision.cpp
View File

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