[Boost-commit] svn:boost r82376 - branches/release/boost/spirit/home/qi/stream

Subject: [Boost-commit] svn:boost r82376 - branches/release/boost/spirit/home/qi/stream
From: hartmut.kaiser_at_[hidden]
Date: 2013-01-06 12:02:09

Author: hkaiser
Date: 2013-01-06 12:02:08 EST (Sun, 06 Jan 2013)
New Revision: 82376
URL: http://svn.boost.org/trac/boost/changeset/82376

Log:
Spirit: Fixing merge problem 
Text files modified: 
   branches/release/boost/spirit/home/qi/stream/stream.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: branches/release/boost/spirit/home/qi/stream/stream.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/stream/stream.hpp	(original)
+++ branches/release/boost/spirit/home/qi/stream/stream.hpp	2013-01-06 12:02:08 EST (Sun, 06 Jan 2013)
@@ -58,7 +58,7 @@
           , typename Skipper, typename Attribute>
         bool parse(Iterator& first, Iterator const& last
           , Context& /*context*/, Skipper const& skipper
-          , Attribute& attr) const
+          , Attribute& attr_) const
         {
             typedef qi::detail::iterator_source<Iterator> source_device;
             typedef boost::iostreams::stream<source_device> instream;