attempt to get GCC 5 in travis (#744)

use GCC 5 in travis
This commit is contained in:
Arvid Norberg 2016-05-21 16:23:15 -04:00
parent 31eba7d86f
commit b4e11a06c0
2 changed files with 9 additions and 6 deletions

View File

@ -36,7 +36,7 @@ addons:
- libboost1.55-all-dev
- libboost1.55-tools-dev
- python2.7-dev
- g++-4.8
- g++-5
- cppcheck
before_install:
@ -65,9 +65,12 @@ before_install:
install:
- g++-4.8 --version
- 'echo "using gcc : : ccache g++-4.8 : <cflags>-std=c11 <cxxflags>-std=c++11 ;" > ~/user-config.jam'
- 'echo "using gcc : coverage : ccache g++-4.8 : <cflags>-std=c11 <cxxflags>-std=c++11 <compileflags>--coverage <linkflags>--coverage ;" >> ~/user-config.jam'
- touch ~/user-config.jam
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then g++-5 --version; fi
- 'if [[ $TRAVIS_OS_NAME == "linux" ]]; then
echo "using gcc : : ccache g++-5 : <cflags>-std=c11 <cxxflags>-std=c++11 ;" >> ~/user-config.jam;
echo "using gcc : coverage : ccache g++-5 : <cflags>-std=c11 <cxxflags>-std=c++11 <compileflags>--coverage <linkflags>--coverage ;" >> ~/user-config.jam;
fi'
# osx builds need to disable the deprecated warning because of the openssl
# shipping with the system having marked all functions as deprecated. Since
@ -92,7 +95,7 @@ script:
- 'if [ "$variant" != "" ]; then
bjam -j3 warnings-as-errors=on variant=$variant -l900 $toolset $target &&
if [[ $TRAVIS_OS_NAME == "linux" && "$coverage" == "1" ]]; then
codecov --root .. --gcov-exec gcov-4.8;
codecov --root .. --gcov-exec gcov-5;
fi;
fi'

View File

@ -101,7 +101,7 @@ struct vector_to_list
static PyObject* convert(const std::vector<T>& v)
{
list l;
for (int i = 0; i < v.size(); ++i)
for (int i = 0; i < int(v.size()); ++i)
{
l.append(v[i]);
}