From 60026b20664681c1665baa2cb6afd13e72fa1521 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 17 Jul 2016 11:07:46 +0200 Subject: [PATCH] Fixed build and clean up --- glm/detail/precision.hpp | 4 +++- glm/detail/type_vec1.hpp | 2 +- glm/detail/type_vec3.hpp | 2 +- glm/detail/type_vec4.hpp | 1 - glm/detail/type_vec4_simd.inl | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/glm/detail/precision.hpp b/glm/detail/precision.hpp index 7980dbdc..7c54437c 100644 --- a/glm/detail/precision.hpp +++ b/glm/detail/precision.hpp @@ -3,6 +3,8 @@ #pragma once +#include "setup.hpp" + namespace glm { enum precision @@ -29,7 +31,7 @@ namespace glm defaultp = highp # endif }; - + namespace detail { template diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index ea25ba44..fe55cd22 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -21,9 +21,9 @@ namespace glm { // -- Implementation detail -- + typedef T value_type; typedef tvec1 type; typedef tvec1 bool_type; - typedef T value_type; // -- Data -- diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index 64e159d8..f90ad3c6 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -20,9 +20,9 @@ namespace glm { // -- Implementation detail -- + typedef T value_type; typedef tvec3 type; typedef tvec3 bool_type; - typedef T value_type; // -- Data -- diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index dcd59dd5..b08bd105 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -3,7 +3,6 @@ #pragma once -#include "setup.hpp" #include "type_vec.hpp" #ifdef GLM_SWIZZLE # if GLM_HAS_ANONYMOUS_UNION diff --git a/glm/detail/type_vec4_simd.inl b/glm/detail/type_vec4_simd.inl index 21504f03..97b65f44 100644 --- a/glm/detail/type_vec4_simd.inl +++ b/glm/detail/type_vec4_simd.inl @@ -49,7 +49,7 @@ namespace detail return Result; } }; -# endif +# endif//GLM_SWIZZLE template struct compute_vec4_add