From 21a37b6c4ce860ff407d24624b9783131665d164 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Sun, 23 Jun 2019 18:07:18 +0100
Subject: [PATCH] CI: revert changes for clang-3.x and revert to using trusty,
 clang-3.x seems to have too many issues with xenial.

---
 .travis.yml                             | 10 ++++++++++
 include/boost/config/compiler/clang.hpp |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2023a5a7..8e5b5946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ matrix:
       env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
 
     - os: linux
+      dist: trusty
       compiler: g++-4.4
       env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
       addons:
@@ -38,6 +39,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: trusty
       compiler: g++-4.6
       env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
       addons:
@@ -48,6 +50,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: trusty
       env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
       addons:
         apt:
@@ -57,6 +60,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: trusty
       env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
       addons:
         apt:
@@ -66,6 +70,7 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
+      dist: trusty
       env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
       addons:
         apt:
@@ -123,6 +128,7 @@ matrix:
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
 
     - os: linux
+      dist: trusty
       env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
       addons:
         apt:
@@ -133,6 +139,7 @@ matrix:
             - llvm-toolchain-precise-3.5
 
     - os: linux
+      dist: trusty
       env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
       addons:
         apt:
@@ -143,6 +150,7 @@ matrix:
             - llvm-toolchain-precise-3.6
 
     - os: linux
+      dist: trusty
       env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
       addons:
         apt:
@@ -153,6 +161,7 @@ matrix:
             - llvm-toolchain-precise-3.7
 
     - os: linux
+      dist: trusty
       env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
       addons:
         apt:
@@ -163,6 +172,7 @@ matrix:
             - llvm-toolchain-precise-3.8
 
     - os: linux
+      dist: trusty
       env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
       addons:
         apt:
diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index 7e0a7044..496f764f 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -269,7 +269,7 @@
 #  define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES
 #endif
 
-#if !__has_feature(__cxx_generic_lambdas__) || (__clang_major__ < 4)
+#if !__has_feature(__cxx_generic_lambdas__)
 #  define BOOST_NO_CXX14_GENERIC_LAMBDAS
 #endif
 
@@ -291,7 +291,7 @@
 #  define BOOST_NO_CXX14_CONSTEXPR
 #endif
 
-#if !__has_feature(__cxx_return_type_deduction__) || (__clang_major__ < 4)
+#if !__has_feature(__cxx_return_type_deduction__)
 #  define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION
 #endif