From fe7e28de52c4269d8a09a1c26a35c3634b913ffb Mon Sep 17 00:00:00 2001
From: John Fletcher <J.P.Fletcher@aston.ac.uk>
Date: Thu, 23 Jan 2014 00:02:32 +0000
Subject: [PATCH] Fixes for bug 9113

---
 include/boost/phoenix/core/visit_each.hpp    | 2 +-
 include/boost/phoenix/function/function.hpp  | 4 ++--
 include/boost/phoenix/statement/do_while.hpp | 4 ++--
 include/boost/phoenix/statement/for.hpp      | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

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 <typename T>
             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 <typename Sig>
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 <typename Do>
     struct do_while_gen
     {
-        do_while_gen(Do const& do_)
-            : do_(do_) {}
+        do_while_gen(Do const& do_it)
+            : do_(do_it) {}
 
         template <typename Cond>
         typename expression::do_while<Cond, Do>::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 <typename Init, typename Cond, typename Step>
     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 Do>
         typename expression::for_<Init, Cond, Step, Do>::type const
-        operator[](Do const& do_) const
+        operator[](Do const& do_it) const
         {
             return
                 expression::
                     for_<Init, Cond, Step, Do>::
-                        make(init, cond, step, do_);
+                        make(init, cond, step, do_it);
         }
 
         Init init;