diff --git a/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp b/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp index 59eba66b..553429e3 100644 --- a/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp +++ b/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp @@ -47,8 +47,8 @@ namespace boost { namespace fusion { typedef Cons cons_type; - explicit boost_tuple_iterator(Cons& cons) - : cons(cons) {} + explicit boost_tuple_iterator(Cons& in_cons) + : cons(in_cons) {} Cons& cons; template diff --git a/include/boost/fusion/adapted/class/detail/adapt_base.hpp b/include/boost/fusion/adapted/class/detail/adapt_base.hpp index 5cdbbcac..264390a6 100644 --- a/include/boost/fusion/adapted/class/detail/adapt_base.hpp +++ b/include/boost/fusion/adapted/class/detail/adapt_base.hpp @@ -45,8 +45,8 @@ typedef BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 0, ATTRIBUTE) lvalue; \ typedef BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 1, ATTRIBUTE) rvalue; \ \ - class_member_proxy(BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& obj)\ - : obj(obj) \ + class_member_proxy(BOOST_FUSION_ADAPT_STRUCT_UNPACK_NAME(NAME_SEQ)& o) \ + : obj(o) \ {} \ \ template \ diff --git a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp index 0f54c938..865d9284 100644 --- a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp +++ b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp @@ -59,7 +59,7 @@ TEMPLATE_PARAMS_SEQ,NAME_SEQ, I, ATTRIBUTE) \ \ BOOST_FUSION_ADAPT_ASSOC_STRUCT_C_BASE( \ - TEMPLATE_PARAMS_SEQ,NAME_SEQ,I,BOOST_PP_EMPTY(),ATTRIBUTE) + TEMPLATE_PARAMS_SEQ,NAME_SEQ,I,BOOST_PP_EMPTY,ATTRIBUTE) #define BOOST_FUSION_ADAPT_ASSOC_TPL_STRUCT( \ TEMPLATE_PARAMS_SEQ, NAME_SEQ, ATTRIBUTES) \ diff --git a/include/boost/fusion/adapted/struct/adapt_struct.hpp b/include/boost/fusion/adapted/struct/adapt_struct.hpp index 408e9460..066da8aa 100644 --- a/include/boost/fusion/adapted/struct/adapt_struct.hpp +++ b/include/boost/fusion/adapted/struct/adapt_struct.hpp @@ -38,7 +38,7 @@ #define BOOST_FUSION_ADAPT_STRUCT_C(TEMPLATE_PARAMS_SEQ, NAME_SEQ, I, ATTRIBUTE)\ BOOST_FUSION_ADAPT_STRUCT_C_BASE( \ - TEMPLATE_PARAMS_SEQ,NAME_SEQ,I,BOOST_PP_EMPTY(),ATTRIBUTE,2) + TEMPLATE_PARAMS_SEQ,NAME_SEQ,I,BOOST_PP_EMPTY,ATTRIBUTE,2) #define BOOST_FUSION_ADAPT_TPL_STRUCT(TEMPLATE_PARAMS_SEQ,NAME_SEQ, ATTRIBUTES) \ BOOST_FUSION_ADAPT_STRUCT_BASE( \ diff --git a/include/boost/fusion/adapted/struct/detail/adapt_base.hpp b/include/boost/fusion/adapted/struct/detail/adapt_base.hpp index 4938e99b..b2d81cf8 100644 --- a/include/boost/fusion/adapted/struct/detail/adapt_base.hpp +++ b/include/boost/fusion/adapted/struct/detail/adapt_base.hpp @@ -117,7 +117,7 @@ static type \ call(Seq& seq) \ { \ - return seq.PREFIX \ + return seq.PREFIX() \ BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE, 1, ATTRIBUTE); \ } \ }; \ diff --git a/include/boost/fusion/adapted/struct/detail/define_struct.hpp b/include/boost/fusion/adapted/struct/detail/define_struct.hpp index 42bc6dcd..5f761463 100644 --- a/include/boost/fusion/adapted/struct/detail/define_struct.hpp +++ b/include/boost/fusion/adapted/struct/detail/define_struct.hpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -42,7 +43,7 @@ #define BOOST_FUSION_DEFINE_STRUCT_ASSIGN_FILLER_I( \ R, ATTRIBUTE_TUPEL_SIZE, I_, ATTRIBUTE) \ \ - BOOST_PP_IF( \ + BOOST_PP_EXPR_IF( \ I_, \ typedef typename \ boost::fusion::result_of::next< \ @@ -50,9 +51,8 @@ >::type \ BOOST_PP_CAT(I,I_); \ BOOST_PP_CAT(I,I_) BOOST_PP_CAT(i,I_)= \ - boost::fusion::next(BOOST_PP_CAT(i,BOOST_PP_DEC(I_)));, \ - BOOST_PP_EMPTY() \ - ) \ + boost::fusion::next(BOOST_PP_CAT(i,BOOST_PP_DEC(I_))); \ + ) \ \ BOOST_PP_TUPLE_ELEM(ATTRIBUTE_TUPEL_SIZE,1,ATTRIBUTE)= \ boost::fusion::deref(BOOST_PP_CAT(i,I_)); diff --git a/include/boost/fusion/adapted/struct/detail/proxy_type.hpp b/include/boost/fusion/adapted/struct/detail/proxy_type.hpp index 90a42444..bf0a6ebd 100644 --- a/include/boost/fusion/adapted/struct/detail/proxy_type.hpp +++ b/include/boost/fusion/adapted/struct/detail/proxy_type.hpp @@ -18,8 +18,8 @@ \ struct NAME \ { \ - NAME(WRAPPED_TYPE& obj) \ - : obj(obj) \ + NAME(WRAPPED_TYPE& in_obj) \ + : obj(in_obj) \ {} \ \ WRAPPED_TYPE& obj; \ diff --git a/include/boost/fusion/algorithm/query/detail/count.hpp b/include/boost/fusion/algorithm/query/detail/count.hpp index 0d03182a..6c4254c3 100644 --- a/include/boost/fusion/algorithm/query/detail/count.hpp +++ b/include/boost/fusion/algorithm/query/detail/count.hpp @@ -50,8 +50,8 @@ namespace boost { namespace fusion { namespace detail struct count_compare { typedef typename detail::call_param::type param; - count_compare(param x) - : x(x) {} + count_compare(param in_x) + : x(in_x) {} template bool diff --git a/include/boost/fusion/algorithm/transformation/detail/replace.hpp b/include/boost/fusion/algorithm/transformation/detail/replace.hpp index 9e20f79f..8005aad0 100644 --- a/include/boost/fusion/algorithm/transformation/detail/replace.hpp +++ b/include/boost/fusion/algorithm/transformation/detail/replace.hpp @@ -41,8 +41,8 @@ namespace boost { namespace fusion { namespace detail template struct replacer { - replacer(T const& old_value, T const& new_value) - : old_value(old_value), new_value(new_value) {} + replacer(T const& in_old_value, T const& in_new_value) + : old_value(in_old_value), new_value(in_new_value) {} template struct result; diff --git a/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp b/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp index db0434c6..fa6068aa 100644 --- a/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp +++ b/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp @@ -41,8 +41,8 @@ namespace boost { namespace fusion { namespace detail template struct replacer_if { - replacer_if(F f, T const& new_value) - : f(f), new_value(new_value) {} + replacer_if(F in_f, T const& in_new_value) + : f(in_f), new_value(in_new_value) {} template struct result; diff --git a/include/boost/fusion/container/list/cons.hpp b/include/boost/fusion/container/list/cons.hpp index b977db14..e2745616 100644 --- a/include/boost/fusion/container/list/cons.hpp +++ b/include/boost/fusion/container/list/cons.hpp @@ -69,13 +69,13 @@ namespace boost { namespace fusion 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) diff --git a/include/boost/fusion/container/list/cons_iterator.hpp b/include/boost/fusion/container/list/cons_iterator.hpp index 9d67a649..1eff1535 100644 --- a/include/boost/fusion/container/list/cons_iterator.hpp +++ b/include/boost/fusion/container/list/cons_iterator.hpp @@ -35,8 +35,8 @@ namespace boost { namespace fusion 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; diff --git a/include/boost/fusion/container/vector/vector_iterator.hpp b/include/boost/fusion/container/vector/vector_iterator.hpp index 559bbf17..8faa13ad 100644 --- a/include/boost/fusion/container/vector/vector_iterator.hpp +++ b/include/boost/fusion/container/vector/vector_iterator.hpp @@ -36,8 +36,8 @@ namespace boost { namespace fusion 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; private: diff --git a/include/boost/fusion/iterator/basic_iterator.hpp b/include/boost/fusion/iterator/basic_iterator.hpp index 33c514f3..4327a8ce 100644 --- a/include/boost/fusion/iterator/basic_iterator.hpp +++ b/include/boost/fusion/iterator/basic_iterator.hpp @@ -122,8 +122,8 @@ namespace boost { namespace fusion : seq(it.seq) {} - basic_iterator(Seq& seq, int) - : seq(&seq) + basic_iterator(Seq& in_seq, int) + : seq(&in_seq) {} template diff --git a/include/boost/fusion/sequence/comparison/detail/equal_to.hpp b/include/boost/fusion/sequence/comparison/detail/equal_to.hpp index 6c78408a..40cd96f4 100644 --- a/include/boost/fusion/sequence/comparison/detail/equal_to.hpp +++ b/include/boost/fusion/sequence/comparison/detail/equal_to.hpp @@ -50,7 +50,7 @@ namespace boost { namespace fusion { namespace detail { template static bool - call(I1 const& a, I2 const& b) + call(I1 const& /*a*/, I2 const& /*b*/) { return false; } diff --git a/include/boost/fusion/view/filter_view/filter_view.hpp b/include/boost/fusion/view/filter_view/filter_view.hpp index ca35c655..76ce031a 100644 --- a/include/boost/fusion/view/filter_view/filter_view.hpp +++ b/include/boost/fusion/view/filter_view/filter_view.hpp @@ -45,8 +45,8 @@ namespace boost { namespace fusion 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); } diff --git a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp index 6fbd0f50..8ce63cbd 100644 --- a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp +++ b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp @@ -54,8 +54,8 @@ namespace boost { namespace fusion 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; diff --git a/include/boost/fusion/view/iterator_range/iterator_range.hpp b/include/boost/fusion/view/iterator_range/iterator_range.hpp index c535b84b..4d16ca6c 100644 --- a/include/boost/fusion/view/iterator_range/iterator_range.hpp +++ b/include/boost/fusion/view/iterator_range/iterator_range.hpp @@ -41,9 +41,9 @@ namespace boost { namespace fusion 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; diff --git a/include/boost/fusion/view/joint_view/joint_view.hpp b/include/boost/fusion/view/joint_view/joint_view.hpp index 1655b8ce..e0d5c090 100644 --- a/include/boost/fusion/view/joint_view/joint_view.hpp +++ b/include/boost/fusion/view/joint_view/joint_view.hpp @@ -52,9 +52,9 @@ namespace boost { namespace fusion 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); } diff --git a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp index 401abe2c..79b4d115 100644 --- a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp +++ b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp @@ -40,9 +40,9 @@ namespace boost { namespace fusion typedef Category 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; diff --git a/include/boost/fusion/view/nview/nview_iterator.hpp b/include/boost/fusion/view/nview/nview_iterator.hpp index 4fc06a85..3b7ec1f9 100644 --- a/include/boost/fusion/view/nview/nview_iterator.hpp +++ b/include/boost/fusion/view/nview/nview_iterator.hpp @@ -41,8 +41,8 @@ namespace boost { namespace fusion typedef Sequence sequence_type; typedef mpl_iterator first_type; - explicit nview_iterator(Sequence& seq) - : seq(seq) {} + explicit nview_iterator(Sequence& in_seq) + : seq(in_seq) {} Sequence& seq; diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view.hpp index c37e8a3d..509db859 100644 --- a/include/boost/fusion/view/repetitive_view/repetitive_view.hpp +++ b/include/boost/fusion/view/repetitive_view/repetitive_view.hpp @@ -37,8 +37,8 @@ namespace boost { namespace fusion mpl::if_, Sequence, sequence_type&>::type stored_seq_type; - repetitive_view(Sequence& seq) - : seq(seq) {} + repetitive_view(Sequence& in_seq) + : seq(in_seq) {} stored_seq_type seq; diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp index f3550e81..4dff006e 100644 --- a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp +++ b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp @@ -35,11 +35,11 @@ namespace boost { namespace fusion typedef typename convert_iterator::type>::type end_type; typedef single_pass_traversal_tag category; - explicit repetitive_view_iterator(Sequence& seq) - : seq(seq), pos(begin(seq)) {} + explicit repetitive_view_iterator(Sequence& in_seq) + : seq(in_seq), pos(begin(in_seq)) {} - repetitive_view_iterator(Sequence& seq, pos_type const& pos) - : seq(seq), pos(pos) {} + repetitive_view_iterator(Sequence& in_seq, pos_type const& in_pos) + : seq(in_seq), pos(in_pos) {} Sequence& seq; pos_type pos; diff --git a/include/boost/fusion/view/reverse_view/reverse_view.hpp b/include/boost/fusion/view/reverse_view/reverse_view.hpp index b76784c0..f3e8ffea 100644 --- a/include/boost/fusion/view/reverse_view/reverse_view.hpp +++ b/include/boost/fusion/view/reverse_view/reverse_view.hpp @@ -49,8 +49,8 @@ namespace boost { namespace fusion bidirectional_traversal_tag , typename traits::category_of::type>::value)); - reverse_view(Sequence& seq) - : seq(seq) + reverse_view(Sequence& in_seq) + : seq(in_seq) {} first_type first() const { return fusion::begin(seq); } diff --git a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp index 676319f0..ddf2e9be 100644 --- a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp +++ b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp @@ -41,8 +41,8 @@ namespace boost { namespace fusion bidirectional_traversal_tag , category>::value)); - reverse_view_iterator(First const& first) - : first(converter::call(first)) {} + reverse_view_iterator(First const& in_first) + : first(converter::call(in_first)) {} first_type first; diff --git a/include/boost/fusion/view/single_view/single_view.hpp b/include/boost/fusion/view/single_view/single_view.hpp index a3f50af4..03087cd6 100644 --- a/include/boost/fusion/view/single_view/single_view.hpp +++ b/include/boost/fusion/view/single_view/single_view.hpp @@ -41,8 +41,8 @@ namespace boost { namespace fusion 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; }; diff --git a/include/boost/fusion/view/transform_view/transform_view.hpp b/include/boost/fusion/view/transform_view/transform_view.hpp index 5bf1447f..3d330b76 100644 --- a/include/boost/fusion/view/transform_view/transform_view.hpp +++ b/include/boost/fusion/view/transform_view/transform_view.hpp @@ -55,10 +55,10 @@ namespace boost { namespace fusion typedef Sequence2 sequence2_type; typedef F transform_type; - transform_view(Sequence1& seq1, Sequence2& seq2, F const& binop) + transform_view(Sequence1& in_seq1, Sequence2& in_seq2, F const& binop) : f(binop) - , seq1(seq1) - , seq2(seq2) + , seq1(in_seq1) + , seq2(in_seq2) {} first1_type first1() const { return fusion::begin(seq1); } @@ -94,9 +94,9 @@ namespace boost { namespace fusion typedef Sequence sequence_type; typedef F transform_type; - transform_view(Sequence& seq, F const& f) - : seq(seq) - , f(f) + transform_view(Sequence& in_seq, F const& in_f) + : seq(in_seq) + , f(in_f) {} first_type first() const { return fusion::begin(seq); } diff --git a/include/boost/fusion/view/transform_view/transform_view_iterator.hpp b/include/boost/fusion/view/transform_view/transform_view_iterator.hpp index fde67323..2c31b261 100644 --- a/include/boost/fusion/view/transform_view/transform_view_iterator.hpp +++ b/include/boost/fusion/view/transform_view/transform_view_iterator.hpp @@ -34,8 +34,8 @@ namespace boost { namespace fusion typedef typename traits::category_of::type category; typedef F transform_type; - transform_view_iterator(First const& first, F const& f) - : first(converter::call(first)), f(f) {} + transform_view_iterator(First const& in_first, F const& in_f) + : first(converter::call(in_first)), f(in_f) {} first_type first; transform_type f; @@ -60,8 +60,8 @@ namespace boost { namespace fusion typedef typename traits::category_of::type category; typedef F transform_type; - transform_view_iterator2(First1 const& first1, First2 const& first2, F const& f) - : first1(converter1::call(first1)), first2(converter2::call(first2)), f(f) {} + transform_view_iterator2(First1 const& in_first1, First2 const& in_first2, F const& in_f) + : first1(converter1::call(in_first1)), first2(converter2::call(in_first2)), f(in_f) {} first1_type first1; first2_type first2; diff --git a/test/algorithm/all.cpp b/test/algorithm/all.cpp index a4c7f32c..7bfefdaa 100644 --- a/test/algorithm/all.cpp +++ b/test/algorithm/all.cpp @@ -16,8 +16,8 @@ namespace { struct search_for { - explicit search_for(int search) - : search(search) + explicit search_for(int in_search) + : search(in_search) {} template diff --git a/test/algorithm/any.cpp b/test/algorithm/any.cpp index 69f114f8..e2c42f8d 100644 --- a/test/algorithm/any.cpp +++ b/test/algorithm/any.cpp @@ -17,8 +17,8 @@ namespace { struct search_for { - explicit search_for(int search) - : search(search) + explicit search_for(int in_search) + : search(in_search) {} template diff --git a/test/algorithm/fold.cpp b/test/algorithm/fold.cpp index 4b2acfc5..38178c75 100644 --- a/test/algorithm/fold.cpp +++ b/test/algorithm/fold.cpp @@ -81,8 +81,8 @@ struct count_ints typename result::type operator()(CountT const&, T const&) const { - typedef typename result::type result; - return result(); + typedef typename result::type result_; + return result_(); } }; diff --git a/test/algorithm/none.cpp b/test/algorithm/none.cpp index ec5676b6..148ad652 100644 --- a/test/algorithm/none.cpp +++ b/test/algorithm/none.cpp @@ -16,8 +16,8 @@ namespace { struct search_for { - explicit search_for(int search) - : search(search) + explicit search_for(int in_search) + : search(in_search) {} template diff --git a/test/sequence/adapt_assoc_class.cpp b/test/sequence/adapt_assoc_class.cpp index 4a14fdcd..67f1c657 100644 --- a/test/sequence/adapt_assoc_class.cpp +++ b/test/sequence/adapt_assoc_class.cpp @@ -31,7 +31,7 @@ namespace ns public: point() : x(0), y(0) {} - point(int x, int y) : x(x), y(y) {} + point(int in_x, int in_y) : x(in_x), y(in_y) {} int get_x() const { return x; } int get_y() const { return y; } diff --git a/test/sequence/adapt_assoc_class_named.cpp b/test/sequence/adapt_assoc_class_named.cpp index b4c6f0ba..0979970c 100644 --- a/test/sequence/adapt_assoc_class_named.cpp +++ b/test/sequence/adapt_assoc_class_named.cpp @@ -31,7 +31,7 @@ namespace ns public: point() : x(0), y(0) {} - point(int x, int y) : x(x), y(y) {} + point(int in_x, int in_y) : x(in_x), y(in_y) {} int get_x() const { return x; } int get_y() const { return y; } diff --git a/test/sequence/adapt_assoc_tpl_class.cpp b/test/sequence/adapt_assoc_tpl_class.cpp index d28face9..d0647ae7 100644 --- a/test/sequence/adapt_assoc_tpl_class.cpp +++ b/test/sequence/adapt_assoc_tpl_class.cpp @@ -32,7 +32,7 @@ namespace ns public: point() : x(0), y(0) {} - point(X x, Y y) : x(x), y(y) {} + point(X in_x, Y in_y) : x(in_x), y(in_y) {} X get_x() const { return x; } Y get_y() const { return y; } diff --git a/test/sequence/adapt_class.cpp b/test/sequence/adapt_class.cpp index cbadd41d..a584f49f 100644 --- a/test/sequence/adapt_class.cpp +++ b/test/sequence/adapt_class.cpp @@ -38,7 +38,7 @@ namespace ns public: point() : x(0), y(0) {} - point(int x, int y) : x(x), y(y) {} + point(int in_x, int in_y) : x(in_x), y(in_y) {} int get_x() const { return x; } int get_y() const { return y; } diff --git a/test/sequence/adapt_class_named.cpp b/test/sequence/adapt_class_named.cpp index 6f505eee..8321a8be 100644 --- a/test/sequence/adapt_class_named.cpp +++ b/test/sequence/adapt_class_named.cpp @@ -38,7 +38,7 @@ namespace ns public: point() : x(0), y(0) {} - point(int x, int y) : x(x), y(y) {} + point(int in_x, int in_y) : x(in_x), y(in_y) {} int get_x() const { return x; } int get_y() const { return y; } diff --git a/test/sequence/adapt_tpl_class.cpp b/test/sequence/adapt_tpl_class.cpp index 1dec528b..2478a570 100644 --- a/test/sequence/adapt_tpl_class.cpp +++ b/test/sequence/adapt_tpl_class.cpp @@ -40,7 +40,7 @@ namespace ns public: point() : x(0), y(0) {} - point(X x, Y y) : x(x), y(y) {} + point(X x_, Y y_) : x(x_), y(y_) {} X get_x() const { return x; } Y get_y() const { return y; } diff --git a/test/sequence/nview.cpp b/test/sequence/nview.cpp index e8110f79..dab982a5 100644 --- a/test/sequence/nview.cpp +++ b/test/sequence/nview.cpp @@ -26,7 +26,7 @@ BOOST_FUSION_ADAPT_STRUCT( (int, int_) (std::string, string_) (double, double_) -); +) namespace fusion = boost::fusion;