mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed Visual C++ 10 build

Browse Source
This commit is contained in:
Christophe Riccio 2014-10-31 01:29:38 +01:00
parent 1331e156cb
commit fc253a0e5b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/func_common.inl
View File

@ -177,7 +177,7 @@ namespace detail
} }
// 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>
@ -196,7 +196,7 @@ namespace detail
} }
// 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>

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) || \