Merge branch '0.9.2' into 0.9.3

master
Christophe Riccio ago%!(EXTRA string=14 years)
commit bfa79b2a67
  1. 4
      glm/core/func_common.inl

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

Loading…
Cancel
Save