[Boost-commit] svn:boost r76382 - in trunk: boost/spirit/repository/home/karma/nonterminal libs/spirit/doc

Subject: [Boost-commit] svn:boost r76382 - in trunk: boost/spirit/repository/home/karma/nonterminal libs/spirit/doc
From: hartmut.kaiser_at_[hidden]
Date: 2012-01-09 08:51:19

Author: hkaiser
Date: 2012-01-09 08:51:18 EST (Mon, 09 Jan 2012)
New Revision: 76382
URL: http://svn.boost.org/trac/boost/changeset/76382

Log:
Spirit: fixed karma::subrule
Text files modified: 
   trunk/boost/spirit/repository/home/karma/nonterminal/subrule.hpp |    10 +++++-----                              
   trunk/libs/spirit/doc/what_s_new.qbk                             |     2 ++                                      
   2 files changed, 7 insertions(+), 5 deletions(-)

Modified: trunk/boost/spirit/repository/home/karma/nonterminal/subrule.hpp
==============================================================================
--- trunk/boost/spirit/repository/home/karma/nonterminal/subrule.hpp	(original)
+++ trunk/boost/spirit/repository/home/karma/nonterminal/subrule.hpp	2012-01-09 08:51:18 EST (Mon, 09 Jan 2012)
@@ -1,6 +1,6 @@
 //  Copyright (c) 2009 Francois Barel
 //  Copyright (c) 2001-2011 Joel de Guzman
-//  Copyright (c) 2001-2011 Hartmut Kaiser
+//  Copyright (c) 2001-2012 Hartmut Kaiser
 //
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -207,8 +207,8 @@
             // trying to use a subrule which has inherited attributes,
             // without passing values for them.
             context_type context(*this
-              , traits::pre_transform<subrule_attr_type>(
-                  make_attribute::call(attr)));
+              , traits::pre_transform<karma::domain, subrule_attr_type>(
+                      make_attribute::call(attr)));
 
             return def.binder(sink, context, delimiter);
         }
@@ -242,8 +242,8 @@
             // trying to use a subrule which has inherited attributes,
             // passing values of incompatible types for them.
             context_type context(*this
-              , traits::pre_transform<subrule_attr_type>(
-                    make_attribute::call(attr)), params, caller_context);
+              , traits::pre_transform<karma::domain, subrule_attr_type>(
+                        make_attribute::call(attr)), params, caller_context);
 
             return def.binder(sink, context, delimiter);
         }

Modified: trunk/libs/spirit/doc/what_s_new.qbk
==============================================================================
--- trunk/libs/spirit/doc/what_s_new.qbk	(original)
+++ trunk/libs/spirit/doc/what_s_new.qbk	2012-01-09 08:51:18 EST (Mon, 09 Jan 2012)
@@ -23,6 +23,8 @@
 * Fixed a problem in [karma_align `center`]`(num)[a]` and
   [karma_align `center`]`(num, g)[a]` if used inside a compound generator (such
   as sequences, Kleene, list, or plus.
+* Fixed `karma::subrule` from the [@../../repository/doc/html/index.html repository]
+  (thanks to Lee Clagett for submitting a patch).
 
 [endsect]