From 39e63661a6d862bcde7f676df88d9098056f86d4 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 4 Jun 2016 23:08:08 +0200 Subject: [PATCH] Fixed STL for C++11 detection on ICC #510 --- glm/detail/setup.hpp | 4 ++-- readme.md | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index b742bd62..7592b4bd 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -666,10 +666,10 @@ # define GLM_HAS_CXX11_STL 0 # endif #else -# define GLM_HAS_CXX11_STL ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && \ +# define GLM_HAS_CXX11_STL ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \ ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \ - ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15))) + ((GLM_PLATFORM != GLM_PLATFORM_WINDOWS) && (GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15)))) #endif // N1720 diff --git a/readme.md b/readme.md index 6d8f2b2c..deac94fc 100644 --- a/readme.md +++ b/readme.md @@ -55,6 +55,9 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ##### Improvements: - Added pkg-config file #509 +##### Fixes: +- Fixed STL for C++11 detection on ICC #510 + #### [GLM 0.9.7.5](https://github.com/g-truc/glm/releases/tag/0.9.7.5) - 2016-05-24 ##### Improvements: - Added Visual C++ Clang toolset detection