From 79787bbff65db6096d0db420d92fc29d9fc13bc4 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 7 Sep 2019 10:51:19 +0200 Subject: [PATCH] Fixed GLM_HAS_CXX11_STL broken on Clang with Linux #926 --- glm/detail/setup.hpp | 3 +-- readme.md | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 41b555efe..d976d7465 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -143,8 +143,7 @@ #if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED) # define GLM_HAS_CXX11_STL 0 #elif GLM_COMPILER & GLM_COMPILER_CLANG -# if ((defined(_LIBCPP_VERSION) || defined(_MSC_VER)) && GLM_LANG & GLM_LANG_CXX11_FLAG) || \ - defined(GLM_LANG_STL11_FORCED) +# if (defined(_LIBCPP_VERSION) || (GLM_LANG & GLM_LANG_CXX11_FLAG) || defined(GLM_LANG_STL11_FORCED)) # define GLM_HAS_CXX11_STL 1 # else # define GLM_HAS_CXX11_STL 0 diff --git a/readme.md b/readme.md index ed1fa01db..dd52d0e25 100644 --- a/readme.md +++ b/readme.md @@ -71,6 +71,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) - Fixed missing const to quaternion conversion operators #890 - Fixed EXT_scalar_ulp and EXT_vector_ulp API coding style - Fixed quaternion componant order: w, {x, y, z} #916 +- Fixed GLM_HAS_CXX11_STL broken on Clang with Linux #926 ### [GLM 0.9.9.5](https://github.com/g-truc/glm/releases/tag/0.9.9.5) - 2019-04-01 #### Fixes: