From ab9aa67c4934f5edbb65bdb31f7292b463755073 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 7 Jun 2017 21:10:52 +0200 Subject: [PATCH] travis: exclose some build env to avoid double tests. --- .travis.yml | 7 +++++-- include/assimp/color4.inl | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f4099a..70ae9e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,11 @@ env: - LINUX=1 TRAVIS_NO_EXPORT=NO ENABLE_COVERALLS=OFF - LINUX=1 SHARED_BUILD=ON ENABLE_COVERALLS=OFF - LINUX=1 SHARED_BUILD=OFF ENABLE_COVERALLS=OFF -# - ANDROID=1 - + exclude: + - os: linux + compiler: clang + - os: osx + compiler: gcc compiler: - gcc - clang diff --git a/include/assimp/color4.inl b/include/assimp/color4.inl index 6f4bf02..b242c4e 100644 --- a/include/assimp/color4.inl +++ b/include/assimp/color4.inl @@ -77,7 +77,6 @@ AI_FORCE_INLINE const aiColor4t& aiColor4t::operator /= (TReal f) // ------------------------------------------------------------------------------------------------ template AI_FORCE_INLINE TReal aiColor4t::operator[](unsigned int i) const { - //return *(&r + i); switch ( i ) { case 0: return r; @@ -93,7 +92,6 @@ AI_FORCE_INLINE TReal aiColor4t::operator[](unsigned int i) const { // ------------------------------------------------------------------------------------------------ template AI_FORCE_INLINE TReal& aiColor4t::operator[](unsigned int i) { -// return *(&r + i); switch ( i ) { case 0: return r; -- 2.7.4