diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl index 0464e1fd..0bfe26e4 100644 --- a/glm/detail/func_common.inl +++ b/glm/detail/func_common.inl @@ -181,11 +181,11 @@ namespace detail template class vecType> GLM_FUNC_QUALIFIER vecType floor(vecType const & x) { - return detail::functor1::call(::std::floor, x); + return detail::functor1::call(floor, x); } // trunc -# if GLM_LANG & GLM_LANG_CXX0X_FLAG +# if GLM_HAS_CXX11_STL using ::std::trunc; # else template @@ -200,11 +200,11 @@ namespace detail template class vecType> GLM_FUNC_QUALIFIER vecType trunc(vecType const & x) { - return detail::functor1::call(::std::trunc, x); + return detail::functor1::call(trunc, x); } // round -# if GLM_LANG & GLM_LANG_CXX0X_FLAG +# if GLM_HAS_CXX11_STL using ::std::round; # else template @@ -277,7 +277,7 @@ namespace detail template class vecType> GLM_FUNC_QUALIFIER vecType ceil(vecType const & x) { - return detail::functor1::call(::std::ceil, x); + return detail::functor1::call(ceil, x); } // fract diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 75e824b8..7495c74a 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -458,6 +458,11 @@ // http://gcc.gnu.org/projects/cxx0x.html // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx +// N1720 +#define GLM_HAS_CXX11_STL ( \ + (GLM_LANG & GLM_LANG_CXX11_FLAG) || \ + ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC13))) + // N1720 #define GLM_HAS_STATIC_ASSERT ( \ (GLM_LANG & GLM_LANG_CXX11_FLAG) || \