Fixed GCC warnings

This commit is contained in:
Christophe Riccio 2012-12-23 01:26:20 +01:00
parent b31d1b560c
commit cd043f2ee2

View File

@ -36,8 +36,10 @@
#include <cmath> #include <cmath>
#include <cfloat> #include <cfloat>
#pragma warning(push) #if(GLM_COMPILER & GLM_COMPILER_VC)
#pragma warning(disable : 4127) # pragma warning(push)
# pragma warning(disable : 4127)
#endif
typedef union typedef union
{ {
@ -186,7 +188,9 @@ namespace detail
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm
#pragma warning(pop) #if(GLM_COMPILER & GLM_COMPILER_VC)
# pragma warning(pop)
#endif
#if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS))) #if((GLM_COMPILER & GLM_COMPILER_VC) || ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_PLATFORM & GLM_PLATFORM_WINDOWS)))
# define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward)) # define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward))