Fixed STL for C++11 detection on ICC #510

This commit is contained in:
Christophe Riccio 2016-06-04 23:08:08 +02:00
parent fe6ab8f3b6
commit 39e63661a6
2 changed files with 5 additions and 2 deletions

View File

@ -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

View File

@ -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