Fixed Visual C++ warnings

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

View File

@ -31,6 +31,11 @@ namespace glm
/// @addtogroup gtx_range /// @addtogroup gtx_range
/// @{ /// @{
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(push)
# pragma warning(disable : 4100) // unreferenced formal parameter
# endif
template<typename T, qualifier Q> template<typename T, qualifier Q>
inline length_t components(vec<1, T, Q> const& v) inline length_t components(vec<1, T, Q> const& v)
{ {
@ -85,5 +90,9 @@ namespace glm
return begin(v) + components(v); return begin(v) + components(v);
} }
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(pop)
# endif
/// @} /// @}
}//namespace glm }//namespace glm

View File

@ -1,6 +1,4 @@
// This has the programs for computing the number of trailing zeros #include <glm/glm.hpp>
// in a word.
// Max line length is 57, to fit in hacker.book.
#include <cstdio> #include <cstdio>
#include <cstdlib> //To define "exit", req'd by XLC. #include <cstdlib> //To define "exit", req'd by XLC.
#include <ctime> #include <ctime>
@ -145,6 +143,11 @@ int ntz7(unsigned x)
return bz + b4 + b3 + b2 + b1 + b0; 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) int ntz7_christophe(unsigned x)
{ {
unsigned y, bz, b4, b3, b2, b1, b0; unsigned y, bz, b4, b3, b2, b1, b0;

View File

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

View File

@ -150,13 +150,16 @@ static int test_bvec4_ctor()
glm::bvec4 const D = A && B; glm::bvec4 const D = A && B;
glm::bvec4 const E = A && C; glm::bvec4 const E = A && C;
glm::bvec4 const F = 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 += D == glm::bvec4(true) ? 0 : 1;
Error += E == glm::bvec4(false) ? 0 : 1; Error += E == glm::bvec4(false) ? 0 : 1;
Error += F == glm::bvec4(true) ? 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; return Error;
} }

View File

@ -420,7 +420,7 @@ namespace taylorCos
Error += glm::abs(Cos1 - Cos0) < 0.1f ? 0 : 1; Error += glm::abs(Cos1 - Cos0) < 0.1f ? 0 : 1;
float const Cos2 = taylorCos::fastCosNew(glm::fvec1(radAngle)).x; float const Cos2 = taylorCos::fastCosNew(glm::fvec1(radAngle)).x;
//Error += glm::abs(Cos2 - Cos0) < 0.1f ? 0 : 1; Error += glm::abs(Cos2 - Cos0) < 0.1f ? 0 : 1;
assert(!Error); assert(!Error);
} }