From bd868e7d2ce7067dd21435f38d471e48abbd42a3 Mon Sep 17 00:00:00 2001 From: Hauke Rehfeld Date: Mon, 21 Jul 2014 14:58:42 +0200 Subject: [PATCH] Fixed CUDA support in MSVC for anonymous unions --- glm/detail/setup.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 5df8e7ab..5200b675 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -547,8 +547,9 @@ #endif // Not standard -#define GLM_HAS_ANONYMOUS_UNION (GLM_LANG & GLM_LANG_CXXMS_FLAG) - +#define GLM_HAS_ANONYMOUS_UNION ( \ + (GLM_LANG & GLM_LANG_CXXMS_FLAG) || \ + ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_CUDA))) ///////////////// // Platform