Merge branch '0.9.5' into nohalf

ago%!(EXTRA string=12 years) · 3948f7d46e
parent 4ed278b9c7 35b0d2afd8
commit 3948f7d46e
1 changed files with 4 additions and 0 deletions
--- a/glm/core/func_vector_relational.hpp
+++ b/glm/core/func_vector_relational.hpp
@ -41,6 +41,8 @@
 #ifndef GLM_CORE_func_vector_relational
 #define GLM_CORE_func_vector_relational GLM_VERSION

+#if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER <= GLM_COMPILER_VC10)) // Workaround a Visual C++ bug
+
 namespace glm
 {
 	/// @addtogroup core_func_vector_relational
@ -131,6 +133,8 @@ namespace glm
 	/// @}
 }//namespace glm

+#endif
+
 #include "func_vector_relational.inl"

 #endif//GLM_CORE_func_vector_relational