From d8628a7c5ece06901382aa308c9c14a7d0df05c8 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 22 Aug 2017 22:01:10 +0300 Subject: [PATCH] Bump msvc version checks from <= 1910 to < 1920 --- include/boost/mp11/algorithm.hpp | 14 +++++++------- include/boost/mp11/bind.hpp | 4 ++-- include/boost/mp11/detail/config.hpp | 2 +- include/boost/mp11/detail/mp_count.hpp | 2 +- include/boost/mp11/function.hpp | 2 +- test/mp_for_each.cpp | 2 +- test/mp_quote.cpp | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/boost/mp11/algorithm.hpp b/include/boost/mp11/algorithm.hpp index 4dce8c4..8edb750 100644 --- a/include/boost/mp11/algorithm.hpp +++ b/include/boost/mp11/algorithm.hpp @@ -67,7 +67,7 @@ template class F, class... L> struct mp_transform_impl template class F, template class L, class... T> struct mp_transform_impl> { -#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) template struct f { using type = F; }; @@ -82,7 +82,7 @@ template class F, template class L, class... T> str template class F, template class L1, class... T1, template class L2, class... T2> struct mp_transform_impl, L2> { -#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) template struct f { using type = F; }; @@ -97,7 +97,7 @@ template class F, template class L1, class... T1, t template class F, template class L1, class... T1, template class L2, class... T2, template class L3, class... T3> struct mp_transform_impl, L2, L3> { -#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) template struct f { using type = F; }; @@ -164,7 +164,7 @@ template class P, template class F, class... L> str using Qp = mp_quote

; using Qf = mp_quote; -#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) template struct _f_ { using type = mp_eval_if_q>, mp_first>, Qf, U...>; }; template using _f = typename _f_::type; @@ -419,7 +419,7 @@ template class P> struct mp_copy_if_impl; template class L, class... T, template class P> struct mp_copy_if_impl, P> { -#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) template struct _f { using type = mp_if, mp_list, mp_list<>>; }; using type = mp_append, typename _f::type...>; #else @@ -440,7 +440,7 @@ template struct mp_remove_impl; template class L, class... T, class V> struct mp_remove_impl, V> { -#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) template struct _f { using type = mp_if, mp_list<>, mp_list>; }; using type = mp_append, typename _f::type...>; #else @@ -461,7 +461,7 @@ template class P> struct mp_remove_if_impl; template class L, class... T, template class P> struct mp_remove_if_impl, P> { -#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) template struct _f { using type = mp_if, mp_list<>, mp_list>; }; using type = mp_append, typename _f::type...>; #else diff --git a/include/boost/mp11/bind.hpp b/include/boost/mp11/bind.hpp index 794b19b..38e1b8c 100644 --- a/include/boost/mp11/bind.hpp +++ b/include/boost/mp11/bind.hpp @@ -65,7 +65,7 @@ template using mp_bind_q = mp_bind; // mp_bind_front template class F, class... T> struct mp_bind_front { -#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1910 && BOOST_MSVC >= 1900 ) +#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1920 && BOOST_MSVC >= 1900 ) #else private: #endif @@ -85,7 +85,7 @@ template using mp_bind_front_q = mp_bind_front class F, class... T> struct mp_bind_back { -#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1910 && BOOST_MSVC >= 1900 ) +#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1920 && BOOST_MSVC >= 1900 ) #else private: #endif diff --git a/include/boost/mp11/detail/config.hpp b/include/boost/mp11/detail/config.hpp index a152f46..68413d7 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, <= 1910 ) +#elif defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) # define BOOST_MP11_NO_CONSTEXPR diff --git a/include/boost/mp11/detail/mp_count.hpp b/include/boost/mp11/detail/mp_count.hpp index ef97827..962b23f 100644 --- a/include/boost/mp11/detail/mp_count.hpp +++ b/include/boost/mp11/detail/mp_count.hpp @@ -91,7 +91,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, <= 1910 ) +#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) template struct _f { using type = mp_to_bool>; }; using type = mp_size_t::type...>::value>; diff --git a/include/boost/mp11/function.hpp b/include/boost/mp11/function.hpp index 8ff66e5..bd30300 100644 --- a/include/boost/mp11/function.hpp +++ b/include/boost/mp11/function.hpp @@ -87,7 +87,7 @@ template using mp_and = typename detail::mp_and_impl>: #endif // mp_all -#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) || BOOST_WORKAROUND( BOOST_GCC, < 70200 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) || BOOST_WORKAROUND( BOOST_GCC, < 70200 ) template using mp_all = mp_bool< mp_count_if< mp_list, mp_not >::value == 0 >; diff --git a/test/mp_for_each.cpp b/test/mp_for_each.cpp index 542493b..4f2cfe3 100644 --- a/test/mp_for_each.cpp +++ b/test/mp_for_each.cpp @@ -54,7 +54,7 @@ int main() #endif -#if !defined( BOOST_NO_CXX14_CONSTEXPR ) && !BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if !defined( BOOST_NO_CXX14_CONSTEXPR ) && !BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) constexpr auto r1 = mp_for_each>( F{0} ); static_assert( r1.s == 123, "r1.s == 123" ); diff --git a/test/mp_quote.cpp b/test/mp_quote.cpp index 0e5d1a5..1591907 100644 --- a/test/mp_quote.cpp +++ b/test/mp_quote.cpp @@ -44,7 +44,7 @@ int main() BOOST_TEST_TRAIT_TRUE((std::is_same>)); #endif -#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1910 && BOOST_MSVC >= 1900 ) +#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1920 && BOOST_MSVC >= 1900 ) #else using R2 = Z; BOOST_TEST_TRAIT_TRUE((std::is_same>));