Browse Source

Fixed Visual C++ 2015 constexpr errors: Disabled only partial support

Christophe Riccio 11 years ago
parent
commit
387f931feb
2 changed files with 3 additions and 3 deletions
  1. 1 2
      glm/detail/setup.hpp
  2. 2 1
      readme.txt

+ 1 - 2
glm/detail/setup.hpp

@@ -539,8 +539,7 @@
 #	define GLM_HAS_CONSTEXPR 1
 #else
 #	define GLM_HAS_CONSTEXPR (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
-		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \
-		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015)))
+		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)))
 #endif
 
 // N2672

+ 2 - 1
readme.txt

@@ -82,7 +82,8 @@ Fixes:
 - Fixed warnings in F2x11_1x10 packing function in GTC_packing #295
 - Fixed Visual Studio natvis support for vec4 #288
 - Fixed GTC_packing *pack*norm*x* build and added tests #292
-- Disabled GTX_scalar_multiplication for GCC #242
+- Disabled GTX_scalar_multiplication for GCC, failing to build tests #242
+- Fixed Visual C++ 2015 constexpr errors: Disabled only partial support
 
 ================================================================================
 GLM 0.9.6.1: 2014-12-10