mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-12-01 20:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vectorize

Browse Source
This commit is contained in:
Christophe Riccio 2014-10-31 01:33:12 +01:00
commit c5776a725e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glm/detail/func_common.inl
View File

@ -181,11 +181,11 @@ namespace detail
template <typename T, precision P, template <typename, precision> class vecType> template <typename T, precision P, template <typename, precision> class vecType>
GLM_FUNC_QUALIFIER vecType<T, P> floor(vecType<T, P> const & x) GLM_FUNC_QUALIFIER vecType<T, P> floor(vecType<T, P> const & x)
{ {
return detail::functor1<T, T, P, vecType>::call(::std::floor, x); return detail::functor1<T, T, P, vecType>::call(floor, x);
} }
// trunc // trunc
# if GLM_LANG & GLM_LANG_CXX0X_FLAG # if GLM_HAS_CXX11_STL
using ::std::trunc; using ::std::trunc;
# else # else
template <typename genType> template <typename genType>
@ -200,11 +200,11 @@ namespace detail
template <typename T, precision P, template <typename, precision> class vecType> template <typename T, precision P, template <typename, precision> class vecType>
GLM_FUNC_QUALIFIER vecType<T, P> trunc(vecType<T, P> const & x) GLM_FUNC_QUALIFIER vecType<T, P> trunc(vecType<T, P> const & x)
{ {
return detail::functor1<T, T, P, vecType>::call(::std::trunc, x); return detail::functor1<T, T, P, vecType>::call(trunc, x);
} }
// round // round
# if GLM_LANG & GLM_LANG_CXX0X_FLAG # if GLM_HAS_CXX11_STL
using ::std::round; using ::std::round;
# else # else
template <typename genType> template <typename genType>
@ -277,7 +277,7 @@ namespace detail
template <typename T, precision P, template <typename, precision> class vecType> template <typename T, precision P, template <typename, precision> class vecType>
GLM_FUNC_QUALIFIER vecType<T, P> ceil(vecType<T, P> const & x) GLM_FUNC_QUALIFIER vecType<T, P> ceil(vecType<T, P> const & x)
{ {
return detail::functor1<T, T, P, vecType>::call(::std::ceil, x); return detail::functor1<T, T, P, vecType>::call(ceil, x);
} }
// fract // fract

5
glm/detail/setup.hpp
View File

@ -458,6 +458,11 @@
// http://gcc.gnu.org/projects/cxx0x.html // http://gcc.gnu.org/projects/cxx0x.html
// http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx // 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 // N1720
#define GLM_HAS_STATIC_ASSERT ( \ #define GLM_HAS_STATIC_ASSERT ( \
(GLM_LANG & GLM_LANG_CXX11_FLAG) || \ (GLM_LANG & GLM_LANG_CXX11_FLAG) || \