mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed Visual C++ warnings

Browse Source
This commit is contained in:
Christophe Riccio
2017-08-18 20:08:36 +02:00
parent d0ed6aef21
commit 7466c4a9e7
5 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/core/core_func_integer_find_lsb.cpp
View File

@@ -1,6 +1,4 @@
// This has the programs for computing the number of trailing zeros
// in a word.
// Max line length is 57, to fit in hacker.book.
#include <glm/glm.hpp>
#include <cstdio>
#include <cstdlib> //To define "exit", req'd by XLC.
#include <ctime>
@@ -145,6 +143,11 @@ int ntz7(unsigned x)
return bz + b4 + b3 + b2 + b1 + b0;
}
// This file has divisions by zero to test isnan
#if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(disable : 4800)
#endif
int ntz7_christophe(unsigned x)
{
unsigned y, bz, b4, b3, b2, b1, b0;

5
test/core/core_func_integer_find_msb.cpp
View File

@@ -1,7 +1,4 @@
// This has the programs for computing the number of leading zeros
// in a word.
// Max line length is 57, to fit in hacker.book.
// Compile with g++, not gcc.
#include <glm/glm.hpp>
#include <cstdio>
#include <cstdlib> // To define "exit", req'd by XLC.
#include <ctime>

7
test/core/core_type_vec4.cpp
View File

@@ -150,13 +150,16 @@ static int test_bvec4_ctor()
glm::bvec4 const D = A && B;
glm::bvec4 const E = A && C;
glm::bvec4 const F = A || C;
bool const G = A == C;
bool const H = A != C;
Error += D == glm::bvec4(true) ? 0 : 1;
Error += E == glm::bvec4(false) ? 0 : 1;
Error += F == glm::bvec4(true) ? 0 : 1;
bool const G = A == C;
bool const H = A != C;
Error += !G ? 0 : 1;
Error += H ? 0 : 1;
return Error;
}