From 302d51279033cbd02b853da58b1abbf55a29ee6c Mon Sep 17 00:00:00 2001
From: Tom Finegan <tomfinegan@google.com>
Date: Wed, 12 Jun 2019 13:17:29 -0700
Subject: [PATCH] TravisCI: Use newer linux images.

---
 .travis.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e218168..d062367 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,27 +3,17 @@ language: cpp
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       compiler: clang
     - os: linux
-      dist: trusty
+      dist: xenial
       compiler: gcc
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.9
-        env:
-          - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
     - os: osx
       osx_image: xcode8.3
       compiler: clang
 
 addons:
   apt:
-    sources:
-    - ubuntu-toolchain-r-test
     packages:
     - ccache
     - cmake
@@ -31,9 +21,6 @@ addons:
 before_install:
   - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew update; fi
   - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew install ccache; fi
-  - if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && [[ "${CXX}" = "g++" ]]; then
-      export CXX="g++-4.9" CC="gcc-4.9";
-    fi
 
 script:
   # Output version info for compilers, cmake, and make