2 changes: 1 addition & 1 deletion include/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
View file
Expand Up @@ -18,7 +18,7 @@ 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
Expand Down
8 changes: 4 additions & 4 deletions include/boost/fusion/support/segmented_fold_until.hpp
View file
Expand Up @@ -20,7 +20,7 @@ namespace boost { namespace fusion
{
//auto segmented_fold_until(seq, state, fun)
//{
// return first(segmented_fold_until_impl(seq, state, nil, fun));
// return first(segmented_fold_until_impl(seq, state, nil_, fun));
//}

namespace result_of
Expand All @@ -32,7 +32,7 @@ namespace boost { namespace fusion
detail::segmented_fold_until_impl<
Sequence
, State
, fusion::nil
, fusion::nil_
, Fun
>
filter;
Expand All @@ -55,7 +55,7 @@ namespace boost { namespace fusion
typename result_of::segmented_fold_until<Sequence, State, Fun>::filter
filter;

return filter::call(seq, state, fusion::nil(), fun);
return filter::call(seq, state, fusion::nil_(), fun);
}

template <typename Sequence, typename State, typename Fun>
Expand All @@ -66,7 +66,7 @@ namespace boost { namespace fusion
typename result_of::segmented_fold_until<Sequence const, State, Fun>::filter
filter;

return filter::call(seq, state, fusion::nil(), fun);
return filter::call(seq, state, fusion::nil_(), fun);
}
}}

Expand Down
8 changes: 4 additions & 4 deletions include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
View file
Expand Up @@ -70,7 +70,7 @@ namespace boost { namespace fusion { namespace detail
// switch (size(stack_begin))
// {
// case 1:
// return nil;
// return nil_;
// case 2:
// // car(cdr(stack_begin)) is a range over values.
// assert(end(front(car(stack_begin))) == end(car(cdr(stack_begin))));
Expand Down Expand Up @@ -205,7 +205,7 @@ namespace boost { namespace fusion { namespace detail
template <typename Stack>
struct make_segment_sequence_front<Stack, 1>
{
typedef typename Stack::cdr_type type; // nil
typedef typename Stack::cdr_type type; // nil_

static type call(Stack const &stack)
{
Expand All @@ -218,7 +218,7 @@ namespace boost { namespace fusion { namespace detail
// switch (size(stack_end))
// {
// case 1:
// return nil;
// return nil_;
// case 2:
// // car(cdr(stack_back)) is a range over values.
// assert(end(front(car(stack_end))) == end(car(cdr(stack_end))));
Expand Down Expand Up @@ -348,7 +348,7 @@ namespace boost { namespace fusion { namespace detail
template <typename Stack>
struct make_segment_sequence_back<Stack, 1>
{
typedef typename Stack::cdr_type type; // nil
typedef typename Stack::cdr_type type; // nil_

static type call(Stack const& stack)
{
Expand Down