From 5dcc56489e1b66dfd5bca751fa9b8dc68059e008 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 21 Jan 2017 21:57:10 +0100 Subject: [PATCH] Fixed GLM_FORCE_CXX11 with Clang and libstlc++ which wasn't using C++11 STL features. #604 --- glm/detail/setup.hpp | 2 +- readme.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 9dbb4136..68c8cb47 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -299,7 +299,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) && GLM_LANG & GLM_LANG_CXX11_FLAG +# 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 2fd322d2..b411c272 100644 --- a/readme.md +++ b/readme.md @@ -51,7 +51,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ## Release notes -#### [GLM 0.9.8.4](https://github.com/g-truc/glm/releases/tag/0.9.8.4) - 2017-01-10 +#### [GLM 0.9.8.4](https://github.com/g-truc/glm/releases/tag/0.9.8.4) - 2017-01-22 ##### Fixes: - Fixed GTC_packing test failing on GCC x86 due to denorms #212 #577 - Fixed POPCNT optimization build in Clang #512 @@ -60,6 +60,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Fixed GTX_matrix_decompose decompose #582 #448 - Fixed GCC 4.5 and older build #566 - Fixed Visual C++ internal error when declaring a global vec type with siwzzle expression enabled #594 +- Fixed GLM_FORCE_CXX11 with Clang and libstlc++ which wasn't using C++11 STL features. #604 #### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12 ##### Improvements: