Skip to content
Snippets Groups Projects
Commit f4a84c91 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

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

parent c76c5152
No related branches found
No related tags found
1 merge request!74Travis ci
...@@ -3,6 +3,8 @@ sudo: required ...@@ -3,6 +3,8 @@ sudo: required
dist: trusty dist: trusty
matrix: matrix:
allow_failures:
compiler: gcc-6
include: include:
- os: linux - os: linux
compiler: gcc compiler: gcc
...@@ -73,9 +75,9 @@ matrix: ...@@ -73,9 +75,9 @@ matrix:
osx_image: beta-xcode6.2 osx_image: beta-xcode6.2
compiler: gcc compiler: gcc
#Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn) #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
# - os: osx - os: osx
# osx_image: beta-xcode6.3 osx_image: beta-xcode6.3
# # #
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
......
...@@ -245,7 +245,7 @@ int main(int argc, char **argv) ...@@ -245,7 +245,7 @@ int main(int argc, char **argv)
#endif #endif
// return to OS // return to OS
#ifndef __GNUC__ #if !defined (__GNUC__) || (__GNUC__ < 5)
return 0; return 0;
#endif #endif
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment