mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed isnan for Intel compiler

Browse Source
This commit is contained in:
Christophe Riccio
2012-09-20 10:17:03 +02:00
parent b1ecabdd28
commit b012c80771
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
glm/core/func_common.inl
View File

@@ -809,8 +809,15 @@ namespace detail
{
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'isnan' only accept floating-point inputs");
# if(GLM_COMPILER & GLM_COMPILER_VC)
# if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_INTEL))
return _isnan(x) != 0;
# elif(GLM_COMPILER & GLM_COMPILER_GCC)
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return _isnan(x) != 0;
# else
return std::isnan(x);
# endif
/*
# elif(GLM_COMPILER & GLM_COMPILER_GCC)
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
return _isnan(x) != 0;
@@ -818,7 +825,8 @@ namespace detail
return std::isnan(x);
# endif
# elif(GLM_COMPILER & GLM_COMPILER_INTEL)
return isnan(x) != 0;
return _isnan(x) != 0;
*/
# else
return std::isnan(x);
# endif