feedc0de/boost_mp11
1
0
Fork 0
forked from boostorg/mp11
Code Pull Requests Activity

Remove clang-3.5,3.9 from .travis.yml; extend g++ workaround in mp_valid to 6.x

Browse Source
This commit is contained in:
Peter Dimov
2016-11-15 20:00:58 +02:00
parent 1814f8088c
commit db2384ecd4
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@@ -30,15 +30,12 @@ addons:
- clang-3.6 - clang-3.6
- clang-3.7 - clang-3.7
- clang-3.8 - clang-3.8
- clang-3.9
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise - llvm-toolchain-precise
- llvm-toolchain-precise-3.5
- llvm-toolchain-precise-3.6 - llvm-toolchain-precise-3.6
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.7
- llvm-toolchain-precise-3.8 - llvm-toolchain-precise-3.8
- llvm-toolchain-precise-3.9
matrix: matrix:
@@ -55,9 +52,6 @@ matrix:
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++11
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11 env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11
@@ -67,9 +61,6 @@ matrix:
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11 env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++11
- os: osx - os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11 env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11

4
test/mp_valid.cpp
View File

@@ -48,8 +48,8 @@ int main()
#endif #endif
BOOST_TEST_TRAIT_FALSE((mp_valid<add_pointer, void, void>)); BOOST_TEST_TRAIT_FALSE((mp_valid<add_pointer, void, void>));
#if !defined( BOOST_GCC ) || !BOOST_WORKAROUND( BOOST_GCC, < 50500 ) #if !defined( BOOST_GCC ) || !BOOST_WORKAROUND( BOOST_GCC, < 70000 )
// g++ up to at least 5.4 doesn't like add_reference for some reason or other // g++ up to at least 6.2 doesn't like add_reference for some reason or other
BOOST_TEST_TRAIT_FALSE((mp_valid<add_reference>)); BOOST_TEST_TRAIT_FALSE((mp_valid<add_reference>));
#if !defined( BOOST_MSVC ) || !BOOST_WORKAROUND( BOOST_MSVC, <= 1800 ) #if !defined( BOOST_MSVC ) || !BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
// msvc-12.0 gives an internal error here // msvc-12.0 gives an internal error here