boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-20 07:42:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace type_traits::ice_and with well documented mpl::and_.

Browse Source
This commit is contained in:
Kohei Takahashi
2014-11-08 02:32:06 +09:00
parent 834250a4c8
commit bd5ce92e10
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/fusion/algorithm/auxiliary/copy.hpp
View File

@ -16,7 +16,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#include <boost/utility/enable_if.hpp> #include <boost/utility/enable_if.hpp>
#include <boost/type_traits/ice.hpp> #include <boost/mpl/and.hpp>
#if defined (BOOST_MSVC) #if defined (BOOST_MSVC)
# pragma warning(push) # pragma warning(push)
@ -62,15 +62,10 @@ namespace boost { namespace fusion
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
BOOST_FUSION_GPU_ENABLED BOOST_FUSION_GPU_ENABLED
inline inline typename enable_if<mpl::and_<
typename traits::is_sequence<Seq1>,
enable_if_c< traits::is_sequence<Seq2>
type_traits::ice_and< > >::type
traits::is_sequence<Seq1>::value
, traits::is_sequence<Seq2>::value
>::value,
void
>::type
copy(Seq1 const& src, Seq2& dest) copy(Seq1 const& src, Seq2& dest)
{ {
BOOST_STATIC_ASSERT( BOOST_STATIC_ASSERT(

15
include/boost/fusion/algorithm/auxiliary/move.hpp
View File

@ -16,7 +16,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#include <boost/utility/enable_if.hpp> #include <boost/utility/enable_if.hpp>
#include <boost/type_traits/ice.hpp> #include <boost/mpl/and_.hpp>
#if defined (BOOST_MSVC) #if defined (BOOST_MSVC)
# pragma warning(push) # pragma warning(push)
@ -62,15 +62,10 @@ namespace boost { namespace fusion
template <typename Seq1, typename Seq2> template <typename Seq1, typename Seq2>
BOOST_FUSION_GPU_ENABLED BOOST_FUSION_GPU_ENABLED
inline inline typename enable_if<mpl::and_<
typename traits::is_sequence<Seq1>,
enable_if_c< traits::is_sequence<Seq2>
type_traits::ice_and< > >::type
traits::is_sequence<Seq1>::value
, traits::is_sequence<Seq2>::value
>::value,
void
>::type
move(Seq1&& src, Seq2& dest) move(Seq1&& src, Seq2& dest)
{ {
BOOST_STATIC_ASSERT( BOOST_STATIC_ASSERT(