Browse Source

Fixed build on VC2010

Christophe Riccio 11 years ago
parent
commit
f8729cd4fa
2 changed files with 2 additions and 2 deletions
  1. 1 1
      glm/detail/func_matrix.hpp
  2. 1 1
      glm/detail/func_vector_relational.hpp

+ 1 - 1
glm/detail/func_matrix.hpp

@@ -147,7 +147,7 @@ namespace detail
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/transpose.xml">GLSL transpose man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.6 Matrix Functions</a>
-#	if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11))
+#	if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012))
 		template <typename T, precision P, template <typename, precision> class matType>
 		GLM_FUNC_DECL typename matType<T, P>::transpose_type transpose(matType<T, P> const & x);
 #	endif

+ 1 - 1
glm/detail/func_vector_relational.hpp

@@ -130,7 +130,7 @@ namespace glm
 	template <precision P, template <typename, precision> class vecType>
 	GLM_FUNC_DECL vecType<bool, P> not_(vecType<bool, P> 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.