From 359312f503a9dc75acf516654734028d6262a3cd Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 25 Jan 2012 12:04:47 +0000 Subject: [PATCH] Fixed warnings --- glm/core/setup.hpp | 2 +- glm/core/type_half.inl | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 313ce14b..425f7c94 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -414,7 +414,7 @@ #define GLM_LANG_CXX98 ((1 << 1) | GLM_LANG_CXX) #define GLM_LANG_CXX03 ((1 << 2) | GLM_LANG_CXX98) #define GLM_LANG_CXX0X ((1 << 3) | GLM_LANG_CXX03) -#define GLM_LANG_CXX11 ((1 << 4) | GLM_LANG_CXX11) +#define GLM_LANG_CXX11 ((1 << 4) | GLM_LANG_CXX0X) #define GLM_LANG_CXXMS (1 << 5) #define GLM_LANG_CXXGNU (1 << 6) diff --git a/glm/core/type_half.inl b/glm/core/type_half.inl index 046fec09..845369d2 100644 --- a/glm/core/type_half.inl +++ b/glm/core/type_half.inl @@ -250,9 +250,7 @@ namespace detail // Assemble the half from s, e and m. // - hdata Hdata(s | (e << 10) | (m >> 13)); - - return Hdata; + return hdata(s | (e << 10) | (m >> 13)); } }