1
0
forked from boostorg/mp11

Revert previous; disable problematic test on 4.7/4.8 instead

This commit is contained in:
Peter Dimov
2017-05-31 09:09:05 +03:00
parent 5733185780
commit d78cf71a97
2 changed files with 6 additions and 12 deletions

View File

@@ -87,18 +87,7 @@ template<class... T> using mp_and = typename detail::mp_and_impl<mp_list<T...>>:
#endif #endif
// mp_all<T...> // mp_all<T...>
#if BOOST_WORKAROUND( BOOST_GCC, < 40900 ) #if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) || BOOST_WORKAROUND( BOOST_GCC, < 70200 )
namespace detail
{
template<class T> using mp_to_true = mp_true;
} // namespace detail
template<class... T> using mp_all = mp_to_bool<std::is_same<mp_list<mp_to_bool<T>...>, mp_list<detail::mp_to_true<T>...>>>;
#elif BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) || BOOST_WORKAROUND( BOOST_GCC, < 70200 )
template<class... T> using mp_all = mp_bool< mp_count_if< mp_list<T...>, mp_not >::value == 0 >; template<class... T> using mp_all = mp_bool< mp_count_if< mp_list<T...>, mp_not >::value == 0 >;

View File

@@ -58,7 +58,12 @@ int main()
BOOST_TEST_TRAIT_TRUE((std::is_same<mp_all<mp_size_t<1>, mp_size_t<2>, mp_size_t<114>, mp_size_t<0>, mp_size_t<94>>, mp_false>)); BOOST_TEST_TRAIT_TRUE((std::is_same<mp_all<mp_size_t<1>, mp_size_t<2>, mp_size_t<114>, mp_size_t<0>, mp_size_t<94>>, mp_false>));
BOOST_TEST_TRAIT_TRUE((std::is_same<check1<void, int, float>, mp_true>)); BOOST_TEST_TRAIT_TRUE((std::is_same<check1<void, int, float>, mp_true>));
#if !BOOST_WORKAROUND( BOOST_GCC, < 40900 )
BOOST_TEST_TRAIT_TRUE((std::is_same<check2<void, int, float>, mp_true>)); BOOST_TEST_TRAIT_TRUE((std::is_same<check2<void, int, float>, mp_true>));
#endif
return boost::report_errors(); return boost::report_errors();
} }