From ff0054490d085a920bb4188d9f792936e9b78ab5 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 2 Sep 2016 01:56:33 +0200 Subject: [PATCH] Fixed GLM_FORCE_UNRESTRICTED_GENTYPE #543 --- glm/detail/setup.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index cf6167f4..fea9aa68 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -359,7 +359,9 @@ #endif // N2346 -#if GLM_COMPILER & GLM_COMPILER_CLANG +#if defined(GLM_FORCE_UNRESTRICTED_GENTYPE) +# define GLM_HAS_DEFAULTED_FUNCTIONS 0 +#elif GLM_COMPILER & GLM_COMPILER_CLANG # define GLM_HAS_DEFAULTED_FUNCTIONS __has_feature(cxx_defaulted_functions) #elif GLM_LANG & GLM_LANG_CXX11_FLAG # define GLM_HAS_DEFAULTED_FUNCTIONS 1 @@ -684,7 +686,7 @@ # define GLM_VECTOR_CALL #endif//GLM_COMPILER -#if GLM_HAS_DEFAULTED_FUNCTIONS && !defined(GLM_FORCE_UNRESTRICTED_GENTYPE) +#if GLM_HAS_DEFAULTED_FUNCTIONS # define GLM_DEFAULT = default # ifdef GLM_FORCE_NO_CTOR_INIT # define GLM_DEFAULT_CTOR = default