travis: exclose some build env to avoid double tests.
authorKim Kulling <kim.kulling@goolemail.com>
Wed, 7 Jun 2017 19:10:52 +0000 (21:10 +0200)
committerKim Kulling <kim.kulling@goolemail.com>
Wed, 7 Jun 2017 19:10:52 +0000 (21:10 +0200)
.travis.yml
include/assimp/color4.inl

index 9f4099a..70ae9e6 100644 (file)
@@ -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
index 6f4bf02..b242c4e 100644 (file)
@@ -77,7 +77,6 @@ AI_FORCE_INLINE const aiColor4t<TReal>& aiColor4t<TReal>::operator /= (TReal f)
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
 AI_FORCE_INLINE TReal aiColor4t<TReal>::operator[](unsigned int i) const {
-    //return *(&r + i);
     switch ( i ) {
         case 0:
             return r;
@@ -93,7 +92,6 @@ AI_FORCE_INLINE TReal aiColor4t<TReal>::operator[](unsigned int i) const {
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
 AI_FORCE_INLINE TReal& aiColor4t<TReal>::operator[](unsigned int i) {
-//    return *(&r + i);
     switch ( i ) {
         case 0:
             return r;