From f8729cd4fa3612989122766dfc004ae6afd301ec Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 16 Nov 2014 01:15:04 +0100 Subject: [PATCH] Fixed build on VC2010 --- glm/detail/func_matrix.hpp | 2 +- glm/detail/func_vector_relational.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/detail/func_matrix.hpp b/glm/detail/func_matrix.hpp index f7b392fe..6ad388a9 100644 --- a/glm/detail/func_matrix.hpp +++ b/glm/detail/func_matrix.hpp @@ -147,7 +147,7 @@ namespace detail /// /// @see GLSL transpose man page /// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions -# if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11)) +# if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)) template class matType> GLM_FUNC_DECL typename matType::transpose_type transpose(matType const & x); # endif diff --git a/glm/detail/func_vector_relational.hpp b/glm/detail/func_vector_relational.hpp index 779ec9db..f365b568 100644 --- a/glm/detail/func_vector_relational.hpp +++ b/glm/detail/func_vector_relational.hpp @@ -130,7 +130,7 @@ namespace glm template class vecType> GLM_FUNC_DECL vecType not_(vecType const & v); -# if (GLM_COMPILER & GLM_COMPILER_VC && GLM_COMPILER >= GLM_COMPILER_VC12)// || (GLM_COMPILER & GLM_COMPILER_APPLE_CLANG && GLM_COMPILER >= GLM_COMPILER_APPLE_CLANG60) +# if (GLM_COMPILER & GLM_COMPILER_VC && GLM_COMPILER >= GLM_COMPILER_VC2013)// || (GLM_COMPILER & GLM_COMPILER_APPLE_CLANG && GLM_COMPILER >= GLM_COMPILER_APPLE_CLANG60) /// Returns the component-wise logical complement of x. /// /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead.