Ticket #3033: boost-02.patch

File boost-02.patch, 5.4 KB (added by gerickson@…, 13 years ago)

Patch for Boost::Fusion -Wshadow and -Wunused Errors

  • boost/fusion/container/list/cons.hpp

    a b  
    6969        cons()
    7070            : car(), cdr() {}
    7171
    72         explicit cons(typename detail::call_param<Car>::type car)
    73             : car(car), cdr() {}
     72        explicit cons(typename detail::call_param<Car>::type in_car)
     73            : car(in_car), cdr() {}
    7474
    7575        cons(
    76             typename detail::call_param<Car>::type car
    77           , typename detail::call_param<Cdr>::type cdr)
    78             : car(car), cdr(cdr) {}
     76            typename detail::call_param<Car>::type in_car
     77          , typename detail::call_param<Cdr>::type in_cdr)
     78            : car(in_car), cdr(in_cdr) {}
    7979       
    8080        template <typename Car2, typename Cdr2>
    8181        cons(cons<Car2, Cdr2> const& rhs)

  • boost/fusion/container/list/cons_iterator.hpp

    a b  
    3535            typename add_const<Cons>::type>
    3636        identity;
    3737       
    38         explicit cons_iterator(cons_type& cons)
    39             : cons(cons) {}
     38        explicit cons_iterator(cons_type& in_cons)
     39            : cons(in_cons) {}
    4040
    4141        cons_type& cons;
    4242    };

  • boost/fusion/container/vector/vector_iterator.hpp

    a b  
    3636        typedef vector_iterator_identity<
    3737            typename add_const<Vector>::type, N> identity;
    3838
    39         vector_iterator(Vector& vec)
    40             : vec(vec) {}
     39        vector_iterator(Vector& in_vec)
     40            : vec(in_vec) {}
    4141        Vector& vec;
    4242    };
    4343}}

  • boost/fusion/view/filter_view/filter_view.hpp

    a b  
    3636        typedef typename result_of::end<Sequence>::type last_type;
    3737        typedef Pred pred_type;
    3838
    39         filter_view(Sequence& seq)
    40             : seq(seq)
     39        filter_view(Sequence& in_seq)
     40            : seq(in_seq)
    4141        {}
    4242
    4343        first_type first() const { return fusion::begin(seq); }

  • boost/fusion/view/filter_view/filter_view_iterator.hpp

    a b  
    3636        typedef last_iter last_type;
    3737        typedef Pred pred_type;
    3838
    39         filter_iterator(First const& first)
    40             : first(filter::call(first_converter::call(first))) {}
     39        filter_iterator(First const& in_first)
     40            : first(filter::call(first_converter::call(in_first))) {}
    4141
    4242        first_type first;
    4343    };

  • boost/fusion/view/iterator_range/iterator_range.hpp

    a b  
    3636
    3737        typedef typename traits::category_of<begin_type>::type category;
    3838
    39         iterator_range(First const& first, Last const& last)
    40             : first(convert_iterator<First>::call(first))
    41             , last(convert_iterator<Last>::call(last)) {}
     39        iterator_range(First const& in_first, Last const& in_last)
     40            : first(convert_iterator<First>::call(in_first))
     41            , last(convert_iterator<Last>::call(in_last)) {}
    4242
    4343        begin_type first;
    4444        end_type last;

  • boost/fusion/view/joint_view/joint_view.hpp

    a b  
    4040        typedef typename result_of::end<Sequence2>::type concat_last_type;
    4141        typedef typename mpl::plus<result_of::size<Sequence1>, result_of::size<Sequence2> >::type size;
    4242
    43         joint_view(Sequence1& seq1, Sequence2& seq2)
    44             : seq1(seq1)
    45             , seq2(seq2)
     43        joint_view(Sequence1& in_seq1, Sequence2& in_seq2)
     44            : seq1(in_seq1)
     45            , seq2(in_seq2)
    4646        {}
    4747
    4848        first_type first() const { return fusion::begin(seq1); }

  • boost/fusion/view/joint_view/joint_view_iterator.hpp

    a b  
    3737        typedef forward_traversal_tag category;
    3838        BOOST_STATIC_ASSERT((!result_of::equal_to<first_type, last_type>::value));
    3939
    40         joint_view_iterator(First const& first, Concat const& concat)
    41             : first(first_converter::call(first))
    42             , concat(concat_converter::call(concat))
     40        joint_view_iterator(First const& in_first, Concat const& in_concat)
     41            : first(first_converter::call(in_first))
     42            , concat(concat_converter::call(in_concat))
    4343        {}
    4444
    4545        first_type first;

  • boost/fusion/view/single_view/single_view.hpp

    a b  
    3535        single_view()
    3636            : val() {}
    3737
    38         explicit single_view(typename detail::call_param<T>::type val)
    39             : val(val) {}
     38        explicit single_view(typename detail::call_param<T>::type in_val)
     39            : val(in_val) {}
    4040
    4141        value_type val;
    4242    };