diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl index 539c3491..8b2d0b02 100644 --- a/glm/detail/func_common.inl +++ b/glm/detail/func_common.inl @@ -640,7 +640,7 @@ namespace detail # elif (GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG)) && (GLM_PLATFORM & GLM_PLATFORM_ANDROID) && __cplusplus < 201103L return _isnan(x) != 0; # elif GLM_COMPILER & GLM_COMPILER_CUDA - return isnan(x) != 0; + return ::isnan(x) != 0; # else return std::isnan(x); # endif @@ -682,7 +682,7 @@ namespace detail # endif # elif GLM_COMPILER & GLM_COMPILER_CUDA // http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/docs/online/group__CUDA__MATH__DOUBLE_g13431dd2b40b51f9139cbb7f50c18fab.html#g13431dd2b40b51f9139cbb7f50c18fab - return isinf(double(x)) != 0; + return ::isinf(double(x)) != 0; # else return std::isinf(x); # endif diff --git a/readme.md b/readme.md index 29c01044..051d4890 100644 --- a/readme.md +++ b/readme.md @@ -110,6 +110,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) - Fixed quaternion constructor from two vectors special cases #469 - Fixed glm::to_string on quaternions wrong components order #681 - Fixed acsch #698 +- Fixed isnan on CUDA #727 #### Deprecation: - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler