mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed warnings: cast and redefined defines

Browse Source
This commit is contained in:
Christophe Riccio 2012-04-23 15:34:29 +01:00
parent 4989ad5a97
commit fb220d3f84
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/core/core_func_swizzle.cpp
View File

@ -7,11 +7,21 @@
// File : test/core/core_func_swizzle.cpp // File : test/core/core_func_swizzle.cpp
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#ifndef GLM_FORCE_ONLY_XYZW
# define GLM_FORCE_ONLY_XYZW # define GLM_FORCE_ONLY_XYZW
#endif
//#ifndef GLM_FORCE_PURE
//# define GLM_FORCE_PURE //# define GLM_FORCE_PURE
//#endif
#ifndef GLM_MESSAGES
# define GLM_MESSAGES # define GLM_MESSAGES
#endif
#ifndef GLM_SWIZZLE
# define GLM_SWIZZLE # define GLM_SWIZZLE
#endif
#ifndef GLM_FORCE_CXX98
# define GLM_FORCE_CXX98 # define GLM_FORCE_CXX98
#endif
#include <glm/glm.hpp> #include <glm/glm.hpp>
int test_vec2_swizzle() int test_vec2_swizzle()

4
test/gtx/gtx_integer.cpp
View File

@ -53,8 +53,8 @@ int test_nlz()
{ {
int Error = 0; int Error = 0;
for(std::size_t i = 1; i < 33; ++i) for(glm::uint i = 1; i < glm::uint(33); ++i)
Error += glm::nlz(i) == 31u - glm::findMSB(i) ? 0 : 1; Error += glm::nlz(i) == glm::uint(31u) - glm::findMSB(i) ? 0 : 1;
//printf("%d, %d\n", glm::nlz(i), 31u - glm::findMSB(i)); //printf("%d, %d\n", glm::nlz(i), 31u - glm::findMSB(i));
return Error; return Error;