Merge branch '0.9.1' into 0.9.2

This commit is contained in:
Christophe Riccio 2011-04-09 09:57:40 +01:00
commit 2bf467eb3c

View File

@ -19,7 +19,7 @@ inline bool isfinite(
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC)
return _finite(x); return _finite(x);
#else//(GLM_COMPILER & GLM_COMPILER_GCC) #else//(GLM_COMPILER & GLM_COMPILER_GCC)
return std::isfinite(x); return std::isfinite(x) != 0;
#endif #endif
} }
@ -61,7 +61,7 @@ inline bool isinf(
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC)
return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF; return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
#else #else
return std::isinf(x); return std::isinf(x) != 0;
#endif #endif
} }
@ -102,7 +102,7 @@ inline bool isnan(genType const & x)
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC)
return _isnan(x); return _isnan(x);
#else #else
return std::isnan(x); return std::isnan(x) != 0;
#endif #endif
} }