Imported Upstream version 1.57.0

[platform/upstream/boost.git] / boost / spirit / home / qi / operator / plus.hpp

diff --git a/boost/spirit/home/qi/operator/plus.hpp b/boost/spirit/home/qi/operator/plus.hpp
index 780403a..3c08d1f 100644 (file)
--- a/boost/spirit/home/qi/operator/plus.hpp
+++ b/boost/spirit/home/qi/operator/plus.hpp
@@ -53,8 +53,8 @@ namespace boost { namespace spirit { namespace qi
             type;
         };
 
-        plus(Subject const& subject)
-          : subject(subject) {}
+        plus(Subject const& subject_)
+          : subject(subject_) {}
 
         template <typename F>
         bool parse_container(F f) const
@@ -72,17 +72,17 @@ namespace boost { namespace spirit { namespace qi
           , typename Skipper, typename Attribute>
         bool parse(Iterator& first, Iterator const& last
           , Context& context, Skipper const& skipper
-          , Attribute& attr) const
+          , Attribute& attr_) const
         {
             typedef detail::fail_function<Iterator, Context, Skipper>
                 fail_function;
 
             // ensure the attribute is actually a container type
-            traits::make_container(attr);
+            traits::make_container(attr_);
 
             Iterator iter = first;
             fail_function f(iter, last, context, skipper);
-            if (!parse_container(detail::make_pass_container(f, attr)))
+            if (!parse_container(detail::make_pass_container(f, attr_)))
                 return false;
 
             first = f.first;