From c9987349143987f5454f356dd6217e4932f35b9d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 21 Sep 2011 09:01:04 +0100 Subject: [PATCH] Restore MS version of hvec* --- glm/core/type_vec2.hpp | 2 +- glm/core/type_vec3.hpp | 2 +- glm/core/type_vec4.hpp | 2 +- glm/gtc/half_float.hpp | 2 +- glm/gtc/half_float.inl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glm/core/type_vec2.hpp b/glm/core/type_vec2.hpp index b9f7aebe..1973e7a3 100644 --- a/glm/core/type_vec2.hpp +++ b/glm/core/type_vec2.hpp @@ -67,9 +67,9 @@ namespace detail # elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT) union { - struct{value_type x, y;}; struct{value_type r, g;}; struct{value_type s, t;}; + struct{value_type x, y;}; }; # else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES) union {value_type x, r, s;}; diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp index 2b504cee..6d17b54e 100644 --- a/glm/core/type_vec3.hpp +++ b/glm/core/type_vec3.hpp @@ -67,9 +67,9 @@ namespace detail # elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT) union { - struct{value_type x, y, z;}; struct{value_type r, g, b;}; struct{value_type s, t, p;}; + struct{value_type x, y, z;}; }; # else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES) union {value_type x, r, s;}; diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp index 30c8ebce..21d326a7 100644 --- a/glm/core/type_vec4.hpp +++ b/glm/core/type_vec4.hpp @@ -67,9 +67,9 @@ namespace detail # elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT) union { - struct{value_type x, y, z, w;}; struct{value_type r, g, b, a;}; struct{value_type s, t, p, q;}; + struct{value_type x, y, z, w;}; }; # else//(GLM_COMPONENT == GLM_COMPONENT_GLSL_NAMES) union {value_type x, r, s;}; diff --git a/glm/gtc/half_float.hpp b/glm/gtc/half_float.hpp index 39a5abeb..8cb6689d 100644 --- a/glm/gtc/half_float.hpp +++ b/glm/gtc/half_float.hpp @@ -47,7 +47,7 @@ namespace glm{ namespace detail { -#if 1 //ndef _MSC_EXTENSIONS +#ifndef _MSC_EXTENSIONS template <> struct tvec2 { diff --git a/glm/gtc/half_float.inl b/glm/gtc/half_float.inl index 086c88fb..2d20f8a0 100644 --- a/glm/gtc/half_float.inl +++ b/glm/gtc/half_float.inl @@ -29,7 +29,7 @@ namespace glm{ namespace detail{ -#if 1 //ndef _MSC_EXTENSIONS +#ifndef _MSC_EXTENSIONS ////////////////////////////////////// // hvec2