Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r55166 - trunk/boost/spirit/repository/home/karma
From: hartmut.kaiser_at_[hidden]
Date: 2009-07-30 14:42:11


Author: hkaiser
Date: 2009-07-25 21:11:24 EDT (Sat, 25 Jul 2009)
New Revision: 55166
URL: http://svn.boost.org/trac/boost/changeset/55166

Log:
Spirit: fixing karma::confix directive
Text files modified:
   trunk/boost/spirit/repository/home/karma/confix.hpp | 10 ++++++----
   1 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/boost/spirit/repository/home/karma/confix.hpp
==============================================================================
--- trunk/boost/spirit/repository/home/karma/confix.hpp (original)
+++ trunk/boost/spirit/repository/home/karma/confix.hpp 2009-07-25 21:11:24 EDT (Sat, 25 Jul 2009)
@@ -19,6 +19,9 @@
 
 #include <boost/spirit/repository/home/support/confix.hpp>
 
+#include <boost/fusion/include/at.hpp>
+#include <boost/fusion/include/vector.hpp>
+
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit
 {
@@ -46,7 +49,6 @@
     using repository::confix;
 
     ///////////////////////////////////////////////////////////////////////////
- // the director for a confix() generated generator
     template <typename Subject, typename Prefix, typename Suffix>
     struct confix_generator
       : spirit::karma::primitive_generator<confix_generator<Subject, Prefix, Suffix> >
@@ -116,11 +118,11 @@
 
         template <typename Terminal>
         result_type operator()(Terminal const& term, Subject const& subject
- , unused_type) const
+ , Modifiers const& modifiers) const
         {
             return result_type(subject
- , compile<karma::domain>(fusion::at_c<0>(term.args))
- , compile<karma::domain>(fusion::at_c<1>(term.args)));
+ , compile<karma::domain>(fusion::at_c<0>(term.args), modifiers)
+ , compile<karma::domain>(fusion::at_c<1>(term.args), modifiers));
         }
     };
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk