From eff1d4e622295cc9c4fec905d348fc41165484d9 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Mon, 2 Oct 2017 11:40:41 -0700 Subject: [PATCH] Try 4.9 to see if that clears up a few of the C++14 errors. --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9522448f4..272a4f87b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,7 @@ matrix: addons: &clang40 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-4.8-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['libstdc++-4.9-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' CUCUMBER_TIMEOUT=60000 - os: linux @@ -94,7 +94,7 @@ matrix: addons: apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-4.8-dev'] + packages: ['libstdc++-4.9-dev'] env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=ON LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/scripts/travis/leaksanitizer.conf" # Release Builds @@ -103,7 +103,7 @@ matrix: addons: apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-4.8-dev'] + packages: ['libstdc++-4.9-dev'] env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON - os: linux @@ -186,7 +186,7 @@ matrix: addons: apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-4.8-dev'] + packages: ['libstdc++-4.9-dev'] env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 install: - pushd ${OSRM_BUILD_DIR} @@ -209,7 +209,7 @@ matrix: addons: apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-4.8-dev'] + packages: ['libstdc++-4.9-dev'] env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 install: - pushd ${OSRM_BUILD_DIR} @@ -232,7 +232,7 @@ matrix: addons: apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-4.8-dev'] + packages: ['libstdc++-4.9-dev'] env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="6" install: - pushd ${OSRM_BUILD_DIR} @@ -255,7 +255,7 @@ matrix: addons: apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-4.8-dev'] + packages: ['libstdc++-4.9-dev'] env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="6" install: - pushd ${OSRM_BUILD_DIR}