--- a/boost/fusion/container/list/cons.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/container/list/cons.hpp 2009-05-14 13:22:20.000000000 -0700 @@ -69,13 +69,13 @@ cons() : car(), cdr() {} - explicit cons(typename detail::call_param::type car) - : car(car), cdr() {} + explicit cons(typename detail::call_param::type in_car) + : car(in_car), cdr() {} cons( - typename detail::call_param::type car - , typename detail::call_param::type cdr) - : car(car), cdr(cdr) {} + typename detail::call_param::type in_car + , typename detail::call_param::type in_cdr) + : car(in_car), cdr(in_cdr) {} template cons(cons const& rhs) --- a/boost/fusion/container/list/cons_iterator.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/container/list/cons_iterator.hpp 2009-05-14 13:21:41.000000000 -0700 @@ -35,8 +35,8 @@ typename add_const::type> identity; - explicit cons_iterator(cons_type& cons) - : cons(cons) {} + explicit cons_iterator(cons_type& in_cons) + : cons(in_cons) {} cons_type& cons; }; --- a/boost/fusion/container/vector/vector_iterator.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/container/vector/vector_iterator.hpp 2009-05-14 13:17:57.000000000 -0700 @@ -36,8 +36,8 @@ typedef vector_iterator_identity< typename add_const::type, N> identity; - vector_iterator(Vector& vec) - : vec(vec) {} + vector_iterator(Vector& in_vec) + : vec(in_vec) {} Vector& vec; }; }} --- a/boost/fusion/view/filter_view/filter_view.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/view/filter_view/filter_view.hpp 2009-05-14 13:27:21.000000000 -0700 @@ -36,8 +36,8 @@ typedef typename result_of::end::type last_type; typedef Pred pred_type; - filter_view(Sequence& seq) - : seq(seq) + filter_view(Sequence& in_seq) + : seq(in_seq) {} first_type first() const { return fusion::begin(seq); } --- a/boost/fusion/view/filter_view/filter_view_iterator.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/view/filter_view/filter_view_iterator.hpp 2009-05-14 13:27:03.000000000 -0700 @@ -36,8 +36,8 @@ typedef last_iter last_type; typedef Pred pred_type; - filter_iterator(First const& first) - : first(filter::call(first_converter::call(first))) {} + filter_iterator(First const& in_first) + : first(filter::call(first_converter::call(in_first))) {} first_type first; }; --- a/boost/fusion/view/iterator_range/iterator_range.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/view/iterator_range/iterator_range.hpp 2009-05-14 13:20:41.000000000 -0700 @@ -36,9 +36,9 @@ typedef typename traits::category_of::type category; - iterator_range(First const& first, Last const& last) - : first(convert_iterator::call(first)) - , last(convert_iterator::call(last)) {} + iterator_range(First const& in_first, Last const& in_last) + : first(convert_iterator::call(in_first)) + , last(convert_iterator::call(in_last)) {} begin_type first; end_type last; --- a/boost/fusion/view/joint_view/joint_view.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/view/joint_view/joint_view.hpp 2009-05-14 13:19:35.000000000 -0700 @@ -40,9 +40,9 @@ typedef typename result_of::end::type concat_last_type; typedef typename mpl::plus, result_of::size >::type size; - joint_view(Sequence1& seq1, Sequence2& seq2) - : seq1(seq1) - , seq2(seq2) + joint_view(Sequence1& in_seq1, Sequence2& in_seq2) + : seq1(in_seq1) + , seq2(in_seq2) {} first_type first() const { return fusion::begin(seq1); } --- a/boost/fusion/view/joint_view/joint_view_iterator.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/view/joint_view/joint_view_iterator.hpp 2009-05-14 13:18:46.000000000 -0700 @@ -37,9 +37,9 @@ typedef forward_traversal_tag category; BOOST_STATIC_ASSERT((!result_of::equal_to::value)); - joint_view_iterator(First const& first, Concat const& concat) - : first(first_converter::call(first)) - , concat(concat_converter::call(concat)) + joint_view_iterator(First const& in_first, Concat const& in_concat) + : first(first_converter::call(in_first)) + , concat(concat_converter::call(in_concat)) {} first_type first; --- a/boost/fusion/view/single_view/single_view.hpp 2007-11-25 10:07:19.000000000 -0800 +++ b/boost/fusion/view/single_view/single_view.hpp 2009-05-14 13:21:08.000000000 -0700 @@ -35,8 +35,8 @@ single_view() : val() {} - explicit single_view(typename detail::call_param::type val) - : val(val) {} + explicit single_view(typename detail::call_param::type in_val) + : val(in_val) {} value_type val; };