feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

merged fusion from the trunk

Browse Source 
[SVN r63560]
This commit is contained in:
Christopher Schmidt
2010-07-03 20:10:58 +00:00
parent 649770fdcd
commit 1572e0e9c3
402 changed files with 4874 additions and 5055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/fusion/iterator/basic_iterator.hpp
View File

@ -122,8 +122,8 @@ namespace boost { namespace fusion
: seq(it.seq)
{}
basic_iterator(Seq& seq, int)
: seq(&seq)
basic_iterator(Seq& in_seq, int)
: seq(&in_seq)
{}
template<typename OtherSeq>

2
include/boost/fusion/iterator/mpl/convert_iterator.hpp
View File

@ -37,7 +37,7 @@ namespace boost { namespace fusion
}
static mpl_iterator<T>
call(T const& x, mpl::false_)
call(T const& /*x*/, mpl::false_)
{
return mpl_iterator<T>();
}

24
include/boost/fusion/iterator/mpl/fusion_iterator.hpp
View File

@ -16,6 +16,27 @@
#include <boost/mpl/next_prior.hpp>
#include <boost/mpl/advance_fwd.hpp>
#include <boost/mpl/distance_fwd.hpp>
#include <boost/mpl/iterator_tags.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/type_traits/is_base_of.hpp>
namespace boost { namespace fusion { namespace detail
{
template<class Category>
struct to_mpl_category {
typedef typename mpl::eval_if<
is_base_of<random_access_traversal_tag, Category>,
mpl::random_access_iterator_tag,
mpl::eval_if<
is_base_of<bidirectional_traversal_tag, Category>,
mpl::bidirectional_iterator_tag,
mpl::forward_iterator_tag
>
>::type type;
};
}}}
namespace boost { namespace mpl
{
@ -23,7 +44,8 @@ namespace boost { namespace mpl
struct fusion_iterator
{
typedef typename fusion::result_of::value_of<Iterator>::type type;
typedef typename fusion::traits::category_of<Iterator>::type category;
typedef typename fusion::traits::category_of<Iterator>::type fusion_category;
typedef typename fusion::detail::to_mpl_category<fusion_category>::type category;
typedef Iterator iterator;
};