From 2c89bb11dfee21dbeb63351484fb7d5aa54b6026 Mon Sep 17 00:00:00 2001 From: Tirus42 Date: Fri, 28 Aug 2015 15:54:48 +0200 Subject: [PATCH] setup.hpp: Moved code in meaningful order. --- glm/detail/setup.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index b91a77ee..99a9db8e 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -689,14 +689,6 @@ ((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)) -#endif - // OpenMP #ifdef _OPENMP # if GLM_COMPILER & GLM_COMPILER_GCC @@ -787,6 +779,14 @@ # define GLM_ARCH GLM_ARCH_PURE #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)) +#endif + // With MinGW-W64, including intrinsic headers before intrin.h will produce some errors. The problem is // that windows.h (and maybe other headers) will silently include intrin.h, which of course causes problems. // To fix, we just explicitly include intrin.h here.