mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed warnings

Browse Source
This commit is contained in:
Christophe Riccio 2014-12-04 00:27:49 +01:00
parent f026e722ee
commit bd2601f12a
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/gtc/gtc_integer.cpp
View File

@ -49,17 +49,17 @@ namespace log2_
{ {
int Error = 0; int Error = 0;
int A0(glm::log2(10.f)); int A0 = static_cast<int>(glm::log2(10.f));
glm::ivec1 B0(glm::log2(glm::vec1(10.f))); glm::ivec1 B0(glm::log2(glm::vec1(10.f)));
glm::ivec2 C0(glm::log2(glm::vec2(10.f))); glm::ivec2 C0(glm::log2(glm::vec2(10.f)));
glm::ivec3 D0(glm::log2(glm::vec3(10.f))); glm::ivec3 D0(glm::log2(glm::vec3(10.f)));
glm::ivec4 E0(glm::log2(glm::vec4(10.f))); glm::ivec4 E0(glm::log2(glm::vec4(10.f)));
int A1 = glm::log2(int(10.f)); int A1 = glm::log2(int(10));
glm::ivec1 B1 = glm::log2(glm::ivec1(10.f)); glm::ivec1 B1 = glm::log2(glm::ivec1(10));
glm::ivec2 C1 = glm::log2(glm::ivec2(10.f)); glm::ivec2 C1 = glm::log2(glm::ivec2(10));
glm::ivec3 D1 = glm::log2(glm::ivec3(10.f)); glm::ivec3 D1 = glm::log2(glm::ivec3(10));
glm::ivec4 E1 = glm::log2(glm::ivec4(10.f)); glm::ivec4 E1 = glm::log2(glm::ivec4(10));
Error += A0 == A1 ? 0 : 1; Error += A0 == A1 ? 0 : 1;
Error += glm::all(glm::equal(B0, B1)) ? 0 : 1; Error += glm::all(glm::equal(B0, B1)) ? 0 : 1;
@ -67,11 +67,11 @@ namespace log2_
Error += glm::all(glm::equal(D0, D1)) ? 0 : 1; Error += glm::all(glm::equal(D0, D1)) ? 0 : 1;
Error += glm::all(glm::equal(E0, E1)) ? 0 : 1; Error += glm::all(glm::equal(E0, E1)) ? 0 : 1;
glm::uint64 A2 = glm::log2(glm::uint64(10.f)); glm::uint64 A2 = glm::log2(glm::uint64(10));
glm::u64vec1 B2 = glm::log2(glm::u64vec1(10.f)); glm::u64vec1 B2 = glm::log2(glm::u64vec1(10));
glm::u64vec2 C2 = glm::log2(glm::u64vec2(10.f)); glm::u64vec2 C2 = glm::log2(glm::u64vec2(10));
glm::u64vec3 D2 = glm::log2(glm::u64vec3(10.f)); glm::u64vec3 D2 = glm::log2(glm::u64vec3(10));
glm::u64vec4 E2 = glm::log2(glm::u64vec4(10.f)); glm::u64vec4 E2 = glm::log2(glm::u64vec4(10));
Error += A2 == glm::uint64(1) ? 0 : 1; Error += A2 == glm::uint64(1) ? 0 : 1;
Error += glm::all(glm::equal(B2, glm::u64vec1(1))) ? 0 : 1; Error += glm::all(glm::equal(B2, glm::u64vec1(1))) ? 0 : 1;
@ -93,7 +93,7 @@ namespace log2_
std::clock_t Begin = clock(); std::clock_t Begin = clock();
for(std::size_t i = 0; i < Count; ++i) for(int i = 0; i < static_cast<int>(Count); ++i)
Result[i] = glm::log2(static_cast<int>(i)); Result[i] = glm::log2(static_cast<int>(i));
std::clock_t End = clock(); std::clock_t End = clock();
@ -107,7 +107,7 @@ namespace log2_
std::clock_t Begin = clock(); std::clock_t Begin = clock();
for(std::size_t i = 0; i < Count; ++i) for(int i = 0; i < static_cast<int>(Count); ++i)
Result[i] = glm::log2(glm::ivec4(i)); Result[i] = glm::log2(glm::ivec4(i));
std::clock_t End = clock(); std::clock_t End = clock();
@ -198,7 +198,7 @@ namespace log2_
std::clock_t Begin = clock(); std::clock_t Begin = clock();
for(std::size_t i = 0; i < Count; ++i) for(int i = 0; i < static_cast<int>(Count); ++i)
Result[i] = glm::log2(glm::vec4(i)); Result[i] = glm::log2(glm::vec4(i));
std::clock_t End = clock(); std::clock_t End = clock();