organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-07 06:25:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed build

Browse source
This commit is contained in:
Christophe Riccio 2017-08-06 23:43:53 +02:00
parent 384dab02e4
commit d63aa4ea85
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
glm/gtc/ulp.hpp
View file

@ -17,6 +17,7 @@
#include "../detail/setup.hpp"
#include "../detail/precision.hpp"
#include "../detail/type_int.hpp"
#include "../detail/compute_vector_relational.hpp"
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTC_ulp extension included")

2
glm/gtc/ulp.inl
View file

@ -81,7 +81,7 @@ namespace detail
if((ix>0x7f800000) || // x is nan
(iy>0x7f800000)) // y is nan
return x+y;
if(detail::compute_equal<float>::call(x, y))
if(compute_equal<float>::call(x, y))
return y; // x=y, return y
if(ix==0)
{ // x == 0

16
test/core/core_func_common.cpp
View file

@ -844,14 +844,20 @@ namespace sign
return (x >> 31) | ((unsigned)-x >> 31);
}
template<typename genFIType>
GLM_FUNC_QUALIFIER genFIType sign_alu2(genFIType x)
GLM_FUNC_QUALIFIER int sign_alu2(int x)
{
GLM_STATIC_ASSERT(
std::numeric_limits<genFIType>::is_signed && std::numeric_limits<genFIType>::is_integer,
"'sign' only accept integer inputs");
GLM_STATIC_ASSERT(std::numeric_limits<int>::is_signed && std::numeric_limits<int>::is_integer, "'sign' only accept integer inputs");
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(push)
# pragma warning(disable : 4146) //cast truncates constant value
# endif
return -((unsigned)x >> 31) | (-(unsigned)x >> 31);
# if GLM_COMPILER & GLM_COMPILER_VC
# pragma warning(pop)
# endif
}
template<typename genFIType>