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

Make mp_replace(_if) SFINAE-friendlier.

Browse Source
This commit is contained in:
Peter Dimov
2017-03-24 18:47:55 +02:00
parent e12eb6f774
commit 946861bb63
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,27 +337,18 @@ template<class L, class N> using mp_take = typename detail::mp_take_impl<L, N>::
namespace detail namespace detail
{ {
#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
template<class L, class V, class W> struct mp_replace_impl; template<class L, class V, class W> struct mp_replace_impl;
template<template<class...> class L, class... T, class V, class W> struct mp_replace_impl<L<T...>, V, W> template<template<class...> class L, class... T, class V, class W> struct mp_replace_impl<L<T...>, V, W>
{ {
#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1800 )
template<class A> struct _f { using type = mp_if<std::is_same<A, V>, W, A>; }; template<class A> struct _f { using type = mp_if<std::is_same<A, V>, W, A>; };
using type = L<typename _f<T>::type...>; using type = L<typename _f<T>::type...>;
};
#else #else
template<class L, class V, class W> struct mp_replace_impl
{
template<class A> using _f = mp_if<std::is_same<A, V>, W, A>; template<class A> using _f = mp_if<std::is_same<A, V>, W, A>;
using type = L<_f<T>...>;
using type = mp_transform<_f, L>;
};
#endif #endif
};
} // namespace detail } // namespace detail
@@ -367,11 +358,12 @@ template<class L, class V, class W> using mp_replace = typename detail::mp_repla
namespace detail namespace detail
{ {
template<class L, template<class...> class P, class W> struct mp_replace_if_impl template<class L, template<class...> class P, class W> struct mp_replace_if_impl;
{
template<class T> using _f = mp_if<P<T>, W, T>;
using type = mp_transform<_f, L>; template<template<class...> class L, class... T, template<class...> class P, class W> struct mp_replace_if_impl<L<T...>, P, W>
{
template<class U> using _f = mp_if<P<U>, W, U>;
using type = L<_f<T>...>;
}; };
} // namespace detail } // namespace detail