diff --git a/include/boost/phoenix/core/visit_each.hpp b/include/boost/phoenix/core/visit_each.hpp index ad4ca14..9a8971e 100644 --- a/include/boost/phoenix/core/visit_each.hpp +++ b/include/boost/phoenix/core/visit_each.hpp @@ -22,7 +22,7 @@ namespace boost { namespace phoenix struct visit_each_impl { Visitor& visitor; - visit_each_impl(Visitor& visitor ) : visitor(visitor) {} + visit_each_impl(Visitor& visitor_ ) : visitor(visitor_) {} template void operator()(T const& t) const diff --git a/include/boost/phoenix/function/function.hpp b/include/boost/phoenix/function/function.hpp index 20d58aa..4817100 100644 --- a/include/boost/phoenix/function/function.hpp +++ b/include/boost/phoenix/function/function.hpp @@ -37,8 +37,8 @@ namespace boost { namespace phoenix : f() {} - BOOST_CONSTEXPR function(F f) - : f(f) + BOOST_CONSTEXPR function(F f_) + : f(f_) {} template diff --git a/include/boost/phoenix/statement/do_while.hpp b/include/boost/phoenix/statement/do_while.hpp index d9b5361..ff0a297 100644 --- a/include/boost/phoenix/statement/do_while.hpp +++ b/include/boost/phoenix/statement/do_while.hpp @@ -43,8 +43,8 @@ namespace boost { namespace phoenix template struct do_while_gen { - do_while_gen(Do const& do_) - : do_(do_) {} + do_while_gen(Do const& do_it) + : do_(do_it) {} template typename expression::do_while::type const diff --git a/include/boost/phoenix/statement/for.hpp b/include/boost/phoenix/statement/for.hpp index e98a1dc..ad4670e 100644 --- a/include/boost/phoenix/statement/for.hpp +++ b/include/boost/phoenix/statement/for.hpp @@ -56,17 +56,17 @@ namespace boost { namespace phoenix template struct for_gen { - for_gen(Init const& init, Cond const& cond, Step const& step) - : init(init), cond(cond), step(step) {} + for_gen(Init const& init_, Cond const& cond_, Step const& step_) + : init(init_), cond(cond_), step(step_) {} template typename expression::for_::type const - operator[](Do const& do_) const + operator[](Do const& do_it) const { return expression:: for_:: - make(init, cond, step, do_); + make(init, cond, step, do_it); } Init init;