From e30685ef96da23079458851c4eed17702f07f2d0 Mon Sep 17 00:00:00 2001 From: Groove Date: Wed, 11 Jul 2018 23:01:24 +0200 Subject: [PATCH] Fixed build --- glm/detail/qualifier.hpp | 30 ++++++++++++++++-------------- glm/detail/setup.hpp | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/glm/detail/qualifier.hpp b/glm/detail/qualifier.hpp index 4d4cc47b..287decdf 100644 --- a/glm/detail/qualifier.hpp +++ b/glm/detail/qualifier.hpp @@ -75,21 +75,23 @@ namespace detail } type; }; - template - struct storage - { - typedef struct alignas(L * sizeof(T)) type { - T data[L]; - } type; - }; +# if GLM_LANG & GLM_LANG_CXX11_FLAG + template + struct storage + { + typedef struct alignas(L * sizeof(T)) type { + T data[L]; + } type; + }; - template - struct storage<3, T, true> - { - typedef struct alignas(4 * sizeof(T)) type { - T data[4]; - } type; - }; + template + struct storage<3, T, true> + { + typedef struct alignas(4 * sizeof(T)) type { + T data[4]; + } type; + }; +# endif # if GLM_ARCH & GLM_ARCH_SSE2_BIT template<> diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 8cba6daf..8c951b62 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -119,7 +119,7 @@ /////////////////////////////////////////////////////////////////////////////////// // C++ Version -// User defines: GLM_FORCE_CXX98, GLM_FORCE_CXX03, GLM_FORCE_CXX11, GLM_FORCE_CXX14 +// User defines: GLM_FORCE_CXX98, GLM_FORCE_CXX03, GLM_FORCE_CXX11, GLM_FORCE_CXX14, GLM_FORCE_CXX17, GLM_FORCE_CXX2A #define GLM_LANG_CXX98_FLAG (1 << 1) #define GLM_LANG_CXX03_FLAG (1 << 2)