From d691bf7d6501c89c3178aacc5772ac3fdc8b3c4c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Dec 2015 12:43:57 +0100 Subject: external/glm: Fix check for availability of C++11 static_assert Change-Id: I0d24bcdfeb0d004607569da089c9f787a868da72 --- external/glm/clang-cl.patch.0 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'external/glm') diff --git a/external/glm/clang-cl.patch.0 b/external/glm/clang-cl.patch.0 index 9e3afc97fa1c..edbc30b2408b 100644 --- a/external/glm/clang-cl.patch.0 +++ b/external/glm/clang-cl.patch.0 @@ -12,3 +12,21 @@ #endif//(GLM_COMPILER & GLM_COMPILER_VC) #endif//(GLM_ARCH != GLM_ARCH_PURE) + +# Fix check for availability of C++11 static_assert (it apparently should be +# conditional on GLM_LANG_CXX11 instead of GLM_LANG_CXX0X, but just don't care +# to try to fix that mess, and use __cplusplus value instead; unconditionally +# using C++11 static_assert would fail in external/libgltf, which uses +# external/glm but does not -std=c++11); falling back to BOOST_STATIC_ASSERT +# would cause unnecessary warnings with clang-cl: +--- glm/core/setup.hpp ++++ glm/core/setup.hpp +@@ -628,7 +628,7 @@ + /////////////////////////////////////////////////////////////////////////////////////////////////// + // Static assert + +-#if(GLM_LANG == GLM_LANG_CXX0X) ++#if __cplusplus >= 201103L + # define GLM_STATIC_ASSERT(x, message) static_assert(x, message) + #elif(defined(BOOST_STATIC_ASSERT)) + # define GLM_STATIC_ASSERT(x, message) BOOST_STATIC_ASSERT(x) -- cgit