feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

CI: revert changes for clang-3.x and revert to using trusty,

Browse Source 
clang-3.x seems to have too many issues with xenial.
This commit is contained in:
jzmaddock
2019-06-23 18:07:18 +01:00
parent d5046fd9e5
commit 21a37b6c4c
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -28,6 +28,7 @@ matrix:
env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
- os: linux - os: linux
dist: trusty
compiler: g++-4.4 compiler: g++-4.4
env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
addons: addons:
@ -38,6 +39,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
dist: trusty
compiler: g++-4.6 compiler: g++-4.6
env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
addons: addons:
@ -48,6 +50,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
dist: trusty
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
addons: addons:
apt: apt:
@ -57,6 +60,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
dist: trusty
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
addons: addons:
apt: apt:
@ -66,6 +70,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
dist: trusty
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
addons: addons:
apt: apt:
@ -123,6 +128,7 @@ matrix:
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11 env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
- os: linux - os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
@ -133,6 +139,7 @@ matrix:
- llvm-toolchain-precise-3.5 - llvm-toolchain-precise-3.5
- os: linux - os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
@ -143,6 +150,7 @@ matrix:
- llvm-toolchain-precise-3.6 - llvm-toolchain-precise-3.6
- os: linux - os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
@ -153,6 +161,7 @@ matrix:
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.7
- os: linux - os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
@ -163,6 +172,7 @@ matrix:
- llvm-toolchain-precise-3.8 - llvm-toolchain-precise-3.8
- os: linux - os: linux
dist: trusty
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:

4
include/boost/config/compiler/clang.hpp
View File

@ -269,7 +269,7 @@
# define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES # define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES
#endif #endif
#if !__has_feature(__cxx_generic_lambdas__) || (__clang_major__ < 4) #if !__has_feature(__cxx_generic_lambdas__)
# define BOOST_NO_CXX14_GENERIC_LAMBDAS # define BOOST_NO_CXX14_GENERIC_LAMBDAS
#endif #endif
@ -291,7 +291,7 @@
# define BOOST_NO_CXX14_CONSTEXPR # define BOOST_NO_CXX14_CONSTEXPR
#endif #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 # define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION
#endif #endif