Merge branch '0.9.5' into nohalf

This commit is contained in:
Christophe Riccio 2013-08-28 11:06:29 +02:00
commit 3948f7d46e

View File

@ -41,6 +41,8 @@
#ifndef GLM_CORE_func_vector_relational #ifndef GLM_CORE_func_vector_relational
#define GLM_CORE_func_vector_relational GLM_VERSION #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 namespace glm
{ {
/// @addtogroup core_func_vector_relational /// @addtogroup core_func_vector_relational
@ -131,6 +133,8 @@ namespace glm
/// @} /// @}
}//namespace glm }//namespace glm
#endif
#include "func_vector_relational.inl" #include "func_vector_relational.inl"
#endif//GLM_CORE_func_vector_relational #endif//GLM_CORE_func_vector_relational