From bd5ce92e10d96c278a931a2f6cb57d7378f26ce7 Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Sat, 8 Nov 2014 02:32:06 +0900 Subject: [PATCH] Replace type_traits::ice_and with well documented mpl::and_. --- include/boost/fusion/algorithm/auxiliary/copy.hpp | 15 +++++---------- include/boost/fusion/algorithm/auxiliary/move.hpp | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/include/boost/fusion/algorithm/auxiliary/copy.hpp b/include/boost/fusion/algorithm/auxiliary/copy.hpp index 7ac8e6f5..f8e16e92 100644 --- a/include/boost/fusion/algorithm/auxiliary/copy.hpp +++ b/include/boost/fusion/algorithm/auxiliary/copy.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #if defined (BOOST_MSVC) # pragma warning(push) @@ -62,15 +62,10 @@ namespace boost { namespace fusion template BOOST_FUSION_GPU_ENABLED - inline - typename - enable_if_c< - type_traits::ice_and< - traits::is_sequence::value - , traits::is_sequence::value - >::value, - void - >::type + inline typename enable_if, + traits::is_sequence + > >::type copy(Seq1 const& src, Seq2& dest) { BOOST_STATIC_ASSERT( diff --git a/include/boost/fusion/algorithm/auxiliary/move.hpp b/include/boost/fusion/algorithm/auxiliary/move.hpp index 688f54a9..81fe1d51 100644 --- a/include/boost/fusion/algorithm/auxiliary/move.hpp +++ b/include/boost/fusion/algorithm/auxiliary/move.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #if defined (BOOST_MSVC) # pragma warning(push) @@ -62,15 +62,10 @@ namespace boost { namespace fusion template BOOST_FUSION_GPU_ENABLED - inline - typename - enable_if_c< - type_traits::ice_and< - traits::is_sequence::value - , traits::is_sequence::value - >::value, - void - >::type + inline typename enable_if, + traits::is_sequence + > >::type move(Seq1&& src, Seq2& dest) { BOOST_STATIC_ASSERT(