[Boost-commit] svn:boost r57199 - in trunk/boost/spirit/home: karma qi/detail qi/stream

Subject: [Boost-commit] svn:boost r57199 - in trunk/boost/spirit/home: karma qi/detail qi/stream
From: hartmut.kaiser_at_[hidden]
Date: 2009-10-28 16:57:51

Author: hkaiser
Date: 2009-10-28 16:57:50 EDT (Wed, 28 Oct 2009)
New Revision: 57199
URL: http://svn.boost.org/trac/boost/changeset/57199

Log:
Spirit: minor edits
Text files modified: 
   trunk/boost/spirit/home/karma/phoenix_attributes.hpp |     6 ++++--                                  
   trunk/boost/spirit/home/qi/detail/assign_to.hpp      |     2 +-                                      
   trunk/boost/spirit/home/qi/stream/stream.hpp         |     2 +-                                      
   3 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/boost/spirit/home/karma/phoenix_attributes.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/phoenix_attributes.hpp	(original)
+++ trunk/boost/spirit/home/karma/phoenix_attributes.hpp	2009-10-28 16:57:50 EDT (Wed, 28 Oct 2009)
@@ -98,9 +98,11 @@
     struct extract_from_attribute<phoenix::actor<Eval> >
     {
         typedef typename boost::result_of<phoenix::actor<Eval>()>::type type;
-        static type call(phoenix::actor<Eval> const& f)
+
+        template <typename Context>
+        static type call(phoenix::actor<Eval> const& f, Context& context)
         {
-            return f();
+            return f(unused, context);
         }
     };
 

Modified: trunk/boost/spirit/home/qi/detail/assign_to.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/detail/assign_to.hpp	(original)
+++ trunk/boost/spirit/home/qi/detail/assign_to.hpp	2009-10-28 16:57:50 EDT (Wed, 28 Oct 2009)
@@ -82,7 +82,7 @@
             attr = val;
         }
     };
-    
+
     template <typename Attribute>
     struct assign_to_attribute_from_value<optional<Attribute>, unused_type>
     {

Modified: trunk/boost/spirit/home/qi/stream/stream.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/stream/stream.hpp	(original)
+++ trunk/boost/spirit/home/qi/stream/stream.hpp	2009-10-28 16:57:50 EDT (Wed, 28 Oct 2009)
@@ -40,7 +40,7 @@
     using spirit::stream;
     using spirit::wstream;
 
-    template <typename Char, typename T = spirit::hold_any>
+    template <typename Char = char, typename T = spirit::hold_any>
     struct stream_parser
       : primitive_parser<stream_parser<Char, T> >
     {