From 3f906960db679fff176edb2eaada22b3d6709bd2 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Thu, 24 Nov 2016 13:56:30 +0100 Subject: [PATCH 1/3] Fixed compiler warnings for g++ 6.2 --- glm/detail/func_common.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl index 0ce66b1c..327b058a 100644 --- a/glm/detail/func_common.inl +++ b/glm/detail/func_common.inl @@ -101,7 +101,7 @@ namespace detail GLM_FUNC_QUALIFIER static genFIType call(genFIType x) { GLM_STATIC_ASSERT( - !std::numeric_limits::is_signed && std::numeric_limits::is_integer || GLM_UNRESTRICTED_GENTYPE, + (!std::numeric_limits::is_signed && std::numeric_limits::is_integer) || GLM_UNRESTRICTED_GENTYPE, "'abs' only accept floating-point and integer scalar or vector inputs"); return x; } From 0472c3f4d6aa4ecdceba89362d0b24aa81909c02 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 24 Nov 2016 19:39:28 +0100 Subject: [PATCH 2/3] Fixed Travis-CI crahing on OSX, doesn't support AVX it seems --- .travis.yml | 66 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29be9e41..ecd8422b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,51 +36,75 @@ script: - cmake --build . - ctest - cd .. -- mkdir ./build_simd_11 -- cd ./build_simd_11 -- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. -- cmake --build . -- ctest -- cd .. - mkdir ./build_pure_98 - cd ./build_pure_98 - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake --build . - ctest - cd .. -- mkdir ./build_simd_98 -- cd ./build_simd_98 -- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. -- cmake --build . -- ctest -- cd .. - mkdir ./build_pure_11_debug - cd ./build_pure_11_debug - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake --build . - ctest - cd .. -- mkdir ./build_simd_11_debug -- cd ./build_simd_11_debug -- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. -- cmake --build . -- ctest -- cd .. - mkdir ./build_pure_98_debug - cd ./build_pure_98_debug - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON .. - cmake --build . - ctest - cd .. +- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then +- mkdir ./build_simd_11 +- cd ./build_simd_11 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_98 +- cd ./build_simd_98 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_11_debug +- cd ./build_simd_11_debug +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_98_debug +- cd ./build_simd_98_debug +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_SSE3=ON .. +- cmake --build . +- ctest +- cd .. +- else +- mkdir ./build_simd_11 +- cd ./build_simd_11 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_98 +- cd ./build_simd_98 +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. +- cmake --build . +- ctest +- cd .. +- mkdir ./build_simd_11_debug +- cd ./build_simd_11_debug +- cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. +- cmake --build . +- ctest +- cd .. - mkdir ./build_simd_98_debug - cd ./build_simd_98_debug - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Debug -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_SIMD_AVX=ON .. - cmake --build . - ctest - cd .. - - - +- fi From a88584f572182767cdace1d464e7526ab531e6f1 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 24 Nov 2016 19:41:06 +0100 Subject: [PATCH 3/3] Fixed GCC 6.2 compiler warnings #580 --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 2073408a..35363c52 100644 --- a/readme.md +++ b/readme.md @@ -56,6 +56,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Fixed GTC_packing test failing on GCC x86 due to denorms #212 #577 - Fixed POPCNT optimization build in Clang #512 - Fixed intersectRayPlane returns true in parallel case #578 +- Fixed GCC 6.2 compiler warnings #580 #### [GLM 0.9.8.3](https://github.com/g-truc/glm/releases/tag/0.9.8.3) - 2016-11-12 ##### Improvements: