travis: Fixedup gcc 5 error and allow gcc 6 to fail

This commit is contained in:
Alam Ed Arias committed 2016-05-28 18:41:08 -04:00
1 parent c76c5152c2
commit f4a84c916e
2 files changed
+6 -4

No files matched your search

+5 -3
View File
@@ -3,6 +3,8 @@ sudo: required
dist: trusty
matrix:
allow_failures:
compiler: gcc-6
include:
- os: linux
compiler: gcc
@@ -73,9 +75,9 @@ matrix:
osx_image: beta-xcode6.2
compiler: gcc
#Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
# - os: osx
# osx_image: beta-xcode6.3
# #
- os: osx
osx_image: beta-xcode6.3
#
- os: osx
osx_image: xcode6.4
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
+1 -1
View File
@@ -245,7 +245,7 @@ int main(int argc, char **argv)
#endif
// return to OS
#ifndef __GNUC__
#if !defined (__GNUC__) || (__GNUC__ < 5)
return 0;
#endif
}