mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed -Weverything warnings

Browse Source
This commit is contained in:
Christophe Riccio 2017-08-10 19:57:35 +02:00
parent 5212c26da2
commit 3a06085edd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glm/gtc/random.inl
View File

@ -3,6 +3,7 @@
#include "../geometric.hpp" #include "../geometric.hpp"
#include "../exponential.hpp" #include "../exponential.hpp"
#include "../trigonometric.hpp"
#include <cstdlib> #include <cstdlib>
#include <ctime> #include <ctime>
#include <cassert> #include <cassert>
@ -331,8 +332,8 @@ namespace detail
template<typename T> template<typename T>
GLM_FUNC_QUALIFIER vec<2, T, defaultp> circularRand(T Radius) GLM_FUNC_QUALIFIER vec<2, T, defaultp> circularRand(T Radius)
{ {
T a = linearRand(T(0), T(6.283185307179586476925286766559f)); T a = linearRand(T(0), static_cast<T>(6.283185307179586476925286766559));
return vec<2, T, defaultp>(cos(a), sin(a)) * Radius; return vec<2, T, defaultp>(glm::cos(a), glm::sin(a)) * Radius;
} }
template<typename T> template<typename T>

4
test/gtc/gtc_random.cpp
View File

@ -283,7 +283,7 @@ int test_diskRand()
{ {
float ResultFloat = 0.0f; float ResultFloat = 0.0f;
double ResultDouble = 0.0f; double ResultDouble = 0.0;
for(std::size_t i = 0; i < TestSamples; ++i) for(std::size_t i = 0; i < TestSamples; ++i)
{ {
@ -305,7 +305,7 @@ int test_ballRand()
{ {
float ResultFloat = 0.0f; float ResultFloat = 0.0f;
double ResultDouble = 0.0f; double ResultDouble = 0.0;
for(std::size_t i = 0; i < TestSamples; ++i) for(std::size_t i = 0; i < TestSamples; ++i)
{ {