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

Fix clang 3.9 -std=c++1z failures

Browse Source
This commit is contained in:
Peter Dimov
2017-03-18 01:05:54 +02:00
parent d58a1f0f03
commit e1edd90c21
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/boost/mp11/algorithm.hpp
View File

@@ -498,7 +498,37 @@ namespace detail
template<class L, class V> struct mp_find_impl;
#if !defined( BOOST_MP11_NO_CONSTEXPR )
#if defined( BOOST_MP11_HAS_FOLD_EXPRESSIONS )
struct mp_index_holder
{
std::size_t i_;
bool f_;
};
constexpr inline mp_index_holder operator+( mp_index_holder const & v, bool f )
{
if( v.f_ )
{
return v;
}
else if( f )
{
return { v.i_, true };
}
else
{
return { v.i_ + 1, false };
}
}
template<template<class...> class L, class... T, class V> struct mp_find_impl<L<T...>, V>
{
static constexpr mp_index_holder _v{ 0, false };
using type = mp_size_t< (_v + ... + std::is_same<T, V>::value).i_ >;
};
#elif !defined( BOOST_MP11_NO_CONSTEXPR )
template<template<class...> class L, class V> struct mp_find_impl<L<>, V>
{
@@ -558,7 +588,15 @@ namespace detail
template<class L, template<class...> class P> struct mp_find_if_impl;
#if !defined( BOOST_MP11_NO_CONSTEXPR )
#if defined( BOOST_MP11_HAS_FOLD_EXPRESSIONS )
template<template<class...> class L, class... T, template<class...> class P> struct mp_find_if_impl<L<T...>, P>
{
static constexpr mp_index_holder _v{ 0, false };
using type = mp_size_t< (_v + ... + P<T>::value).i_ >;
};
#elif !defined( BOOST_MP11_NO_CONSTEXPR )
template<template<class...> class L, template<class...> class P> struct mp_find_if_impl<L<>, P>
{

8
include/boost/mp11/detail/config.hpp
View File

@@ -21,4 +21,12 @@
#endif
#if defined(BOOST_CLANG) && defined(__has_cpp_attribute)
# if __has_cpp_attribute(fallthrough) && __cplusplus >= 201406L // Clang 3.9+ in c++1z mode
# define BOOST_MP11_HAS_FOLD_EXPRESSIONS
# endif
#endif
#endif // #ifndef BOOST_MP11_DETAIL_CONFIG_HPP_INCLUDED