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

Merge branch '0.9.2' into 0.9.3

Browse source
This commit is contained in:
Christophe Riccio 2011-10-25 13:52:16 +01:00
commit bfa79b2a67
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
glm/core/func_common.inl
View file

@ -800,6 +800,8 @@ namespace detail
#if(GLM_COMPILER & GLM_COMPILER_VC)
return typename genType::bool_type(_isnan(x));
#elif(defined(ANDROID))
return typename genType::bool_type(isnan(x));
#else
return typename genType::bool_type(std::isnan(x));
#endif
@ -851,6 +853,8 @@ namespace detail
#if(GLM_COMPILER & GLM_COMPILER_VC)
return typename genType::bool_type(_fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF);
#elif(defined(ANDROID))
return typename genType::bool_type(isinf(x));
#else
return typename genType::bool_type(std::isinf(x));
#endif