From 3a2a6f465c2e5e3e5e55d8c54d6317f255c5a878 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 5 Mar 2017 20:25:06 +0200 Subject: [PATCH 1/4] Add more configurations to .travis.yml --- .travis.yml | 111 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 95 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f9ffa7..a94e19e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,57 +21,136 @@ env: matrix: - BOGUS_JOB=true -addons: - apt: - packages: - - g++-4.9 - - g++-5 - - g++-6 - - clang-3.6 - - clang-3.7 - - clang-3.8 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise - - llvm-toolchain-precise-3.6 - - llvm-toolchain-precise-3.7 - - llvm-toolchain-precise-3.8 - matrix: exclude: - env: BOGUS_JOB=true include: + - os: linux + env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11 + addons: + apt: + packages: + - g++-4.7 + sources: + - ubuntu-toolchain-r-test + + - os: linux + env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++11 + addons: + apt: + packages: + - g++-4.8 + sources: + - ubuntu-toolchain-r-test + - os: linux env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11 + addons: + apt: + packages: + - g++-4.9 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11 + addons: + apt: + packages: + - g++-5 + sources: + - ubuntu-toolchain-r-test + + - os: linux + env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 + addons: + apt: + packages: + - g++-5 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 + addons: + apt: + packages: + - g++-6 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 + addons: + apt: + packages: + - g++-6 + sources: + - ubuntu-toolchain-r-test - os: linux env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z + addons: + apt: + packages: + - g++-6 + sources: + - ubuntu-toolchain-r-test + + - os: linux + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11 - os: linux env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11 + addons: + apt: + packages: + - clang-3.6 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.6 - os: linux env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++11 + addons: + apt: + packages: + - clang-3.7 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11 + addons: + apt: + packages: + - clang-3.8 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14 + addons: + apt: + packages: + - clang-3.8 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.8 - os: linux env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z + addons: + apt: + packages: + - clang-3.8 + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.8 - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11 From f476548d85d9dfa59c50b6f73ed1aeb7c12db335 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 5 Mar 2017 20:57:43 +0200 Subject: [PATCH 2/4] Remove g++ 4.7, 4.8, default clang from .travis.yml --- .travis.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index a94e19e..baa848b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,24 +27,6 @@ matrix: - env: BOGUS_JOB=true include: - - os: linux - env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11 - addons: - apt: - packages: - - g++-4.7 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++11 - addons: - apt: - packages: - - g++-4.8 - sources: - - ubuntu-toolchain-r-test - - os: linux env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11 addons: @@ -99,9 +81,6 @@ matrix: sources: - ubuntu-toolchain-r-test - - os: linux - env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11 - - os: linux env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11 addons: From 586392ca51c651dafda33a749c16c7d2d90c7833 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 14 Mar 2017 00:35:19 +0200 Subject: [PATCH 3/4] VC++2017 still needs the workarounds. --- include/boost/mp11/detail/config.hpp | 2 +- include/boost/mp11/detail/mp_count.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/mp11/detail/config.hpp b/include/boost/mp11/detail/config.hpp index 47cc3ba..69539aa 100644 --- a/include/boost/mp11/detail/config.hpp +++ b/include/boost/mp11/detail/config.hpp @@ -15,7 +15,7 @@ # define BOOST_MP11_NO_CONSTEXPR -#elif defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1900 ) +#elif defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) # define BOOST_MP11_NO_CONSTEXPR diff --git a/include/boost/mp11/detail/mp_count.hpp b/include/boost/mp11/detail/mp_count.hpp index 8a6ada5..782e5c6 100644 --- a/include/boost/mp11/detail/mp_count.hpp +++ b/include/boost/mp11/detail/mp_count.hpp @@ -69,7 +69,7 @@ template class L, class... T, template class P> str template class L, class... T, template class P> struct mp_count_if_impl, P> { -#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1900 ) +#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) template struct _f { using type = mp_to_bool>; }; using type = mp_size_t::type...>::value>; From 5f81bd18d4712fda50c8fd0a11f656327eaaed7d Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 14 Mar 2017 00:46:55 +0200 Subject: [PATCH 4/4] Remove tools/inspect from CI. --- .travis.yml | 1 - appveyor.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index baa848b..a888e72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,7 +142,6 @@ install: - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - git submodule update --init tools/build - - git submodule update --init tools/inspect - git submodule update --init libs/config - git submodule update --init tools/boostdep - mkdir libs/mp11 diff --git a/appveyor.yml b/appveyor.yml index c3ce666..d4eb4f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,6 @@ install: - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - git submodule update --init tools/build - - git submodule update --init tools/inspect - git submodule update --init libs/config - git submodule update --init tools/boostdep - mkdir libs\mp11