From cd043f2ee292f16232f7b71e2027509a7547e0f5 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 23 Dec 2012 01:26:20 +0100 Subject: [PATCH] Fixed GCC warnings --- glm/gtc/ulp.inl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/glm/gtc/ulp.inl b/glm/gtc/ulp.inl index 2875c68f..32720500 100644 --- a/glm/gtc/ulp.inl +++ b/glm/gtc/ulp.inl @@ -36,8 +36,10 @@ #include #include -#pragma warning(push) -#pragma warning(disable : 4127) +#if(GLM_COMPILER & GLM_COMPILER_VC) +# pragma warning(push) +# pragma warning(disable : 4127) +#endif typedef union { @@ -186,7 +188,9 @@ namespace detail }//namespace detail }//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))) # define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward))