[Boost-commit] svn:boost r66052 - in trunk/boost/spirit/home/classic: error_handling utility

Subject: [Boost-commit] svn:boost r66052 - in trunk/boost/spirit/home/classic: error_handling utility
From: hartmut.kaiser_at_[hidden]
Date: 2010-10-17 16:48:36

Author: hkaiser
Date: 2010-10-17 16:48:34 EDT (Sun, 17 Oct 2010)
New Revision: 66052
URL: http://svn.boost.org/trac/boost/changeset/66052

Log:
Spirit: fixed #4713 (boost.spirit.warnings.patch), applied patch
Text files modified: 
   trunk/boost/spirit/home/classic/error_handling/exceptions.hpp |     4 ++--                                    
   trunk/boost/spirit/home/classic/utility/functor_parser.hpp    |     6 +++---                                  
   trunk/boost/spirit/home/classic/utility/loops.hpp             |    20 ++++++++++----------                    
   3 files changed, 15 insertions(+), 15 deletions(-)

Modified: trunk/boost/spirit/home/classic/error_handling/exceptions.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/error_handling/exceptions.hpp	(original)
+++ trunk/boost/spirit/home/classic/error_handling/exceptions.hpp	2010-10-17 16:48:34 EDT (Sun, 17 Oct 2010)
@@ -222,9 +222,9 @@
 
         error_status(
             result_t result_ = fail,
-            std::ptrdiff_t length = -1,
+            std::ptrdiff_t length_ = -1,
             T const& value_ = T())
-        : result(result_), length(length), value(value_) {}
+        : result(result_), length(length_), value(value_) {}
 
         result_t        result;
         std::ptrdiff_t  length;

Modified: trunk/boost/spirit/home/classic/utility/functor_parser.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/functor_parser.hpp	(original)
+++ trunk/boost/spirit/home/classic/utility/functor_parser.hpp	2010-10-17 16:48:34 EDT (Sun, 17 Oct 2010)
@@ -54,13 +54,13 @@
             typedef typename ScannerT::iterator_t   iterator_t;
 
             iterator_t const s(scan.first);
-            functor_result_t result;
-            std::ptrdiff_t len = functor(scan, result);
+            functor_result_t functor_result;
+            std::ptrdiff_t len = functor(scan, functor_result);
 
             if (len < 0)
                 return scan.no_match();
             else
-                return scan.create_match(std::size_t(len), result, s, scan.first);
+                return scan.create_match(std::size_t(len), functor_result, s, scan.first);
         }
     };
 

Modified: trunk/boost/spirit/home/classic/utility/loops.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/loops.hpp	(original)
+++ trunk/boost/spirit/home/classic/utility/loops.hpp	2010-10-17 16:48:34 EDT (Sun, 17 Oct 2010)
@@ -47,8 +47,8 @@
         typedef fixed_loop<ParserT, ExactT>     self_t;
         typedef unary<ParserT, parser<self_t> >  base_t;
 
-        fixed_loop (ParserT const & subject, ExactT const & exact)
-        : base_t(subject), m_exact(exact) {}
+        fixed_loop (ParserT const & subject_, ExactT const & exact)
+        : base_t(subject_), m_exact(exact) {}
 
         template <typename ScannerT>
         typename parser_result <self_t, ScannerT>::type
@@ -112,8 +112,8 @@
         typedef finite_loop <ParserT, MinT, MaxT> self_t;
         typedef unary<ParserT, parser<self_t> >   base_t;
 
-        finite_loop (ParserT const & subject, MinT const & min, MaxT const & max)
-        : base_t(subject), m_min(min), m_max(max) {}
+        finite_loop (ParserT const & subject_, MinT const & min, MaxT const & max)
+        : base_t(subject_), m_min(min), m_max(max) {}
 
         template <typename ScannerT>
         typename parser_result <self_t, ScannerT>::type
@@ -196,11 +196,11 @@
         typedef unary<ParserT, parser<self_t> > base_t;
 
         infinite_loop (
-            ParserT const& subject,
+            ParserT const& subject_,
             MinT const& min,
             more_t const&
         )
-        : base_t(subject), m_min(min) {}
+        : base_t(subject_), m_min(min) {}
 
         template <typename ScannerT>
         typename parser_result <self_t, ScannerT>::type
@@ -253,9 +253,9 @@
 
         template <typename ParserT>
         fixed_loop <ParserT, ExactT>
-        operator[](parser <ParserT> const & subject) const
+        operator[](parser <ParserT> const & subject_) const
         {
-            return fixed_loop <ParserT, ExactT> (subject.derived (), m_exact);
+            return fixed_loop <ParserT, ExactT> (subject_.derived (), m_exact);
         }
 
         ExactT m_exact;
@@ -283,11 +283,11 @@
 
        template <typename ParserT>
        typename impl::loop_traits<ParserT, MinT, MaxT>::type
-       operator[](parser <ParserT> const & subject) const
+       operator[](parser <ParserT> const & subject_) const
        {
            typedef typename impl::loop_traits<ParserT, MinT, MaxT>::type ret_t;
            return ret_t(
-                subject.derived(),
+                subject_.derived(),
                 m_min,
                 m_max);
        }