From 05a518011d045b8bbf59fb46bd4ac04194f448fa Mon Sep 17 00:00:00 2001
From: Tristan Penman <tristan@tristanpenman.com>
Date: Sat, 6 Aug 2016 12:38:27 -0700
Subject: [PATCH] Remove non-C++11 and gcc 4.9 stages from Travis CI build
 script

---
 .travis.yml |  8 --------
 travis.sh   | 16 ++--------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1e2d881..866ff72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,6 @@ dist: trusty
 
 matrix:
   include:
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.9', 'valgrind', 'python-pip', 'python-yaml']
-      env: COMPILER=g++-4.9
-
     - os: linux
       compiler: gcc
       addons:
diff --git a/travis.sh b/travis.sh
index fe6a6e0..081fe1c 100755
--- a/travis.sh
+++ b/travis.sh
@@ -26,22 +26,10 @@ if [[ $CXX == 'clang++' ]]; then
 	echo "Additional flags to pass to cmake: $CMAKE_FLAGS"
 fi
 
-echo "Attempting to build and run test suite with C++11 support disabled..."
-cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=disabled ..
+echo "Attempting to build and run test suite with C++11 support enabled..."
+cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=enabled ..
 VERBOSE=1 make
 ./test_suite
-
-echo "Checking if current compiler is GCC..."
-if [[ $CXX == 'g++' ]]; then
-	echo "Not building test suite with C++11 support due to ancient version of GCC on Travis CI"
-else
-	echo "Attempting to build and run test suite with C++11 support enabled..."
-	make clean
-	cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=enabled ..
-	VERBOSE=1 make
-	./test_suite
-fi
-
 make clean
 
 popd > /dev/null