From 41cf89516e3b6a5747c2d2c7fee187d84eb6c5cb Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 7 Jan 2017 12:36:25 +0100 Subject: [PATCH] Bring back compatibility with GLM 0.9.8 for project using tvec* with C++11 compiler that support template alias --- glm/detail/type_vec.hpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/glm/detail/type_vec.hpp b/glm/detail/type_vec.hpp index c45a25e5..ba721681 100644 --- a/glm/detail/type_vec.hpp +++ b/glm/detail/type_vec.hpp @@ -101,14 +101,22 @@ namespace detail # endif }//namespace detail - typedef vec<1, float, highp> highp_vec1_t; +#if GLM_HAS_TEMPLATE_ALIASES + template struct vec; + template using tvec1 = vec<1, T, P>; + template using tvec2 = vec<2, T, P>; + template using tvec3 = vec<3, T, P>; + template using tvec4 = vec<4, T, P>; +#endif//GLM_HAS_TEMPLATE_ALIASES + + typedef vec<1, float, highp> highp_vec1_t; typedef vec<1, float, mediump> mediump_vec1_t; typedef vec<1, float, lowp> lowp_vec1_t; typedef vec<1, double, highp> highp_dvec1_t; typedef vec<1, double, mediump> mediump_dvec1_t; - typedef vec<1, double, lowp> lowp_dvec1_t; + typedef vec<1, double, lowp> lowp_dvec1_t; typedef vec<1, int, highp> highp_ivec1_t; - typedef vec<1, int, mediump> mediump_ivec1_t; + typedef vec<1, int, mediump> mediump_ivec1_t; typedef vec<1, int, lowp> lowp_ivec1_t; typedef vec<1, uint, highp> highp_uvec1_t; typedef vec<1, uint, mediump> mediump_uvec1_t;