From 5adc3aba255889231d6df2d2295c1ec6c120ed0f Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 7 Feb 2014 17:53:31 +0000 Subject: [PATCH] changes to correct shadow warnings --- include/boost/phoenix/bind/detail/member_function_ptr.hpp | 4 ++-- include/boost/phoenix/bind/detail/member_variable.hpp | 4 ++-- include/boost/phoenix/scope/lambda.hpp | 4 ++-- include/boost/phoenix/statement/while.hpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/boost/phoenix/bind/detail/member_function_ptr.hpp b/include/boost/phoenix/bind/detail/member_function_ptr.hpp index aa40d13..93c3219 100644 --- a/include/boost/phoenix/bind/detail/member_function_ptr.hpp +++ b/include/boost/phoenix/bind/detail/member_function_ptr.hpp @@ -28,8 +28,8 @@ namespace boost { namespace phoenix { namespace detail { typedef typename member_function_ptr_impl:: template impl base; - member_function_ptr(FP fp) - : base(fp) {} + member_function_ptr(FP fp_) + : base(fp_) {} using base::fp; diff --git a/include/boost/phoenix/bind/detail/member_variable.hpp b/include/boost/phoenix/bind/detail/member_variable.hpp index 163e33b..27a0365 100644 --- a/include/boost/phoenix/bind/detail/member_variable.hpp +++ b/include/boost/phoenix/bind/detail/member_variable.hpp @@ -43,8 +43,8 @@ namespace boost { namespace phoenix { namespace detail { type; }; - member_variable(MP mp) - : mp(mp) {} + member_variable(MP mp_) + : mp(mp_) {} template RT& operator()(Class& obj) const diff --git a/include/boost/phoenix/scope/lambda.hpp b/include/boost/phoenix/scope/lambda.hpp index 0162fe7..dd8b141 100644 --- a/include/boost/phoenix/scope/lambda.hpp +++ b/include/boost/phoenix/scope/lambda.hpp @@ -337,8 +337,8 @@ namespace boost { namespace phoenix template struct lambda_actor_gen { - lambda_actor_gen(Locals const & locals) - : locals(locals) + lambda_actor_gen(Locals const & locals_) + : locals(locals_) {} lambda_actor_gen(lambda_actor_gen const & o) diff --git a/include/boost/phoenix/statement/while.hpp b/include/boost/phoenix/statement/while.hpp index 273b2e4..0dee932 100644 --- a/include/boost/phoenix/statement/while.hpp +++ b/include/boost/phoenix/statement/while.hpp @@ -44,13 +44,13 @@ namespace boost { namespace phoenix template struct while_gen { - while_gen(Cond const& cond) : cond(cond) {} + while_gen(Cond const& cond_) : cond(cond_) {} template typename expression::while_::type const - operator[](Do const& do_) const + operator[](Do const& do_it) const { - return expression::while_::make(cond, do_); + return expression::while_::make(cond, do_it); } Cond const& cond;