Browse Source

Fixed builtin bitscan never being used #392

Christophe Riccio 10 years ago
parent
commit
a93d09be34
2 changed files with 2 additions and 3 deletions
  1. 1 2
      glm/detail/setup.hpp
  2. 1 1
      readme.md

+ 1 - 2
glm/detail/setup.hpp

@@ -804,12 +804,11 @@
 		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013))))
 #endif
 
-//
 #if GLM_ARCH == GLM_ARCH_PURE
 #	define GLM_HAS_BITSCAN_WINDOWS 0
 #else
 #	define GLM_HAS_BITSCAN_WINDOWS ((GLM_PLATFORM & GLM_PLATFORM_WINDOWS) && (\
-		(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_LLVM | GLM_COMPILER_INTEL)))
+		(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_LLVM | GLM_COMPILER_INTEL))))
 #endif
 
 // OpenMP

+ 1 - 1
readme.md

@@ -62,7 +62,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Fixed non-identity quaternions for equal vectors #234
 - Fixed excessive GTX_fast_trigonometry execution time #396
 - Fixed Visual Studio 2015 'hides class member' warnings #394
-- Fixed builtin bitscan always used even when GLM_FORCE_PURE requested #392
+- Fixed builtin bitscan never being used #392
 
 #### [GLM 0.9.7.0](https://github.com/g-truc/glm/releases/tag/0.9.7.0) - 2015-08-02
 ##### Features: