mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed glm::isinf and glm::isnan for with Android NDK 9d #191, take 2

Browse Source
This commit is contained in:
Christophe Riccio 2014-05-06 22:45:18 +02:00
parent e04ded9e39
commit affd405b37
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glm/detail/func_common.inl
View File

@ -716,12 +716,8 @@ namespace detail
# if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_INTEL)) # if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_INTEL))
return _isnan(x) != 0; return _isnan(x) != 0;
# elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG)) # elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG))
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID) # if(GLM_PLATFORM & GLM_PLATFORM_ANDROID && __cplusplus < 201103L)
# if(GLM_PLATFORM_ANDROID_VERSION >= 19) return _isnan(x) != 0;
return std::isnan(x);
# else
return _isnan(x) != 0;
# endif
# else # else
return std::isnan(x); return std::isnan(x);
# endif # endif
@ -791,12 +787,8 @@ namespace detail
# if(GLM_COMPILER & (GLM_COMPILER_INTEL | GLM_COMPILER_VC)) # if(GLM_COMPILER & (GLM_COMPILER_INTEL | GLM_COMPILER_VC))
return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF; return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
# elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG)) # elif(GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG))
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID) # if(GLM_PLATFORM & GLM_PLATFORM_ANDROID && __cplusplus < 201103L)
# if(GLM_PLATFORM_ANDROID_VERSION >= 19) return _isinf(x) != 0;
return std::isinf(x);
# else
return _isinf(x) != 0;
# endif
# else # else
return std::isinf(x); return std::isinf(x);
# endif # endif

2
glm/detail/setup.hpp
View File

@ -68,8 +68,6 @@
# define GLM_PLATFORM GLM_PLATFORM_CHROME_NACL # define GLM_PLATFORM GLM_PLATFORM_CHROME_NACL
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
# define GLM_PLATFORM GLM_PLATFORM_ANDROID # define GLM_PLATFORM GLM_PLATFORM_ANDROID
# include <android/api-level.h>
# define GLM_PLATFORM_ANDROID_VERSION __ANDROID_API__
#elif defined(__linux) #elif defined(__linux)
# define GLM_PLATFORM GLM_PLATFORM_LINUX # define GLM_PLATFORM GLM_PLATFORM_LINUX
#elif defined(__unix) #elif defined(__unix)