Merged 84441 to release

[SVN r86251]
This commit is contained in:
Joel de Guzman
2013-10-12 01:35:27 +00:00
parent a9335aa664
commit 93447d3382
2 changed files with 6 additions and 6 deletions

View File

@ -22,19 +22,19 @@ namespace boost { namespace fusion { namespace detail
// return make_segmented_iterator( segmented_begin_impl( seq, nil_ ) );
//}
template <typename Sequence, typename Nil = fusion::nil_>
template <typename Sequence, typename Nil_ = fusion::nil_>
struct segmented_begin
{
typedef
segmented_iterator<
typename segmented_begin_impl<Sequence, Nil>::type
typename segmented_begin_impl<Sequence, Nil_>::type
>
type;
static type call(Sequence& seq)
{
return type(
segmented_begin_impl<Sequence, Nil>::call(seq, Nil()));
segmented_begin_impl<Sequence, Nil_>::call(seq, Nil_()));
}
};

View File

@ -18,19 +18,19 @@ namespace boost { namespace fusion { namespace detail
// return make_segmented_iterator( segmented_end_impl( seq ) );
//}
template <typename Sequence, typename Nil = fusion::nil_>
template <typename Sequence, typename Nil_ = fusion::nil_>
struct segmented_end
{
typedef
segmented_iterator<
typename segmented_end_impl<Sequence, Nil>::type
typename segmented_end_impl<Sequence, Nil_>::type
>
type;
static type call(Sequence & seq)
{
return type(
segmented_end_impl<Sequence, Nil>::call(seq, Nil()));
segmented_end_impl<Sequence, Nil_>::call(seq, Nil_()));
}
};