Ticket #5010: fusion_nil_typename.patch

File fusion_nil_typename.patch, 2.0 KB (added by Richard Eakin <reakinator@…>, 9 years ago)

rename Nil to Nil_ for segmented_begin.hpp / segmented_end.hpp

  • boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp

     
    2222    //    return make_segmented_iterator( segmented_begin_impl( seq, nil_ ) );
    2323    //}
    2424
    25     template <typename Sequence, typename Nil = fusion::nil_>
     25    template <typename Sequence, typename Nil_ = fusion::nil_>
    2626    struct segmented_begin
    2727    {
    2828        typedef
    2929            segmented_iterator<
    30                 typename segmented_begin_impl<Sequence, Nil>::type
     30                typename segmented_begin_impl<Sequence, Nil_>::type
    3131            >
    3232        type;
    3333
    3434        static type call(Sequence& seq)
    3535        {
    3636            return type(
    37                 segmented_begin_impl<Sequence, Nil>::call(seq, Nil()));
     37                segmented_begin_impl<Sequence, Nil_>::call(seq, Nil_()));
    3838        }
    3939    };
    4040
  • boost/fusion/sequence/intrinsic/detail/segmented_end.hpp

     
    1818    //    return make_segmented_iterator( segmented_end_impl( seq ) );
    1919    //}
    2020
    21     template <typename Sequence, typename Nil = fusion::nil_>
     21    template <typename Sequence, typename Nil_ = fusion::nil_>
    2222    struct segmented_end
    2323    {
    2424        typedef
    2525            segmented_iterator<
    26                 typename segmented_end_impl<Sequence, Nil>::type
     26                typename segmented_end_impl<Sequence, Nil_>::type
    2727            >
    2828        type;
    2929
    3030        static type call(Sequence & seq)
    3131        {
    3232            return type(
    33                 segmented_end_impl<Sequence, Nil>::call(seq, Nil()));
     33                segmented_end_impl<Sequence, Nil_>::call(seq, Nil_()));
    3434        }
    3535    };
    3636