[Boost-commit] svn:boost r49139 - trunk/boost/spirit/home/qi/operator

Subject: [Boost-commit] svn:boost r49139 - trunk/boost/spirit/home/qi/operator
From: hartmut.kaiser_at_[hidden]
Date: 2008-10-05 09:51:21

Author: hkaiser
Date: 2008-10-05 09:51:21 EDT (Sun, 05 Oct 2008)
New Revision: 49139
URL: http://svn.boost.org/trac/boost/changeset/49139

Log:
Disambiguated calls to spirit::left and spirit::right
Text files modified: 
   trunk/boost/spirit/home/qi/operator/difference.hpp |    10 ++++++----                              
   trunk/boost/spirit/home/qi/operator/list.hpp       |     4 ++--                                    
   2 files changed, 8 insertions(+), 6 deletions(-)

Modified: trunk/boost/spirit/home/qi/operator/difference.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/operator/difference.hpp	(original)
+++ trunk/boost/spirit/home/qi/operator/difference.hpp	2008-10-05 09:51:21 EDT (Sun, 05 Oct 2008)
@@ -56,14 +56,16 @@
 
             // Try RHS first
             Iterator start = first;
-            if (rdirector::parse(right(component), first, last, context, skipper, unused))
+            if (rdirector::parse(spirit::right(component), first, last, context, 
+                skipper, unused))
             {
                 // RHS succeeds, we fail.
                 first = start;
                 return false;
             }
             // RHS fails, now try LHS
-            return ldirector::parse(left(component), first, last, context, skipper, attr);
+            return ldirector::parse(spirit::left(component), first, last, 
+                context, skipper, attr);
         }
 
         template <typename Component, typename Context>
@@ -79,9 +81,9 @@
                 result_of::right<Component>::type::director
             rdirector;
 
-            result += ldirector::what(left(component), ctx);
+            result += ldirector::what(spirit::left(component), ctx);
             result += ", ";
-            result += rdirector::what(right(component), ctx);
+            result += rdirector::what(spirit::right(component), ctx);
             result += "]";
             return result;
         }

Modified: trunk/boost/spirit/home/qi/operator/list.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/operator/list.hpp	(original)
+++ trunk/boost/spirit/home/qi/operator/list.hpp	2008-10-05 09:51:21 EDT (Sun, 05 Oct 2008)
@@ -85,9 +85,9 @@
                 result_of::right<Component>::type::director
             rdirector;
 
-            result += ldirector::what(left(component), ctx);
+            result += ldirector::what(spirit::left(component), ctx);
             result += ", ";
-            result += rdirector::what(right(component), ctx);
+            result += rdirector::what(spirit::right(component), ctx);
             result += "]";
             return result;
         }