[Boost-commit] svn:boost r49327 - in trunk/boost/spirit/home: karma/auxiliary qi/auxiliary support/auxiliary

Subject: [Boost-commit] svn:boost r49327 - in trunk/boost/spirit/home: karma/auxiliary qi/auxiliary support/auxiliary
From: hartmut.kaiser_at_[hidden]
Date: 2008-10-14 12:19:06

Author: hkaiser
Date: 2008-10-14 12:19:05 EDT (Tue, 14 Oct 2008)
New Revision: 49327
URL: http://svn.boost.org/trac/boost/changeset/49327

Log:
Spirit: Fixed part of the current regressions
Text files modified: 
   trunk/boost/spirit/home/karma/auxiliary/meta_grammar.hpp |     2 +-                                      
   trunk/boost/spirit/home/qi/auxiliary/meta_grammar.hpp    |     2 +-                                      
   trunk/boost/spirit/home/support/auxiliary/confix.hpp     |    10 +++++-----                              
   3 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/boost/spirit/home/karma/auxiliary/meta_grammar.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/auxiliary/meta_grammar.hpp	(original)
+++ trunk/boost/spirit/home/karma/auxiliary/meta_grammar.hpp	2008-10-14 12:19:05 EDT (Tue, 14 Oct 2008)
@@ -68,7 +68,7 @@
             >,
             // confix("...", "...")[...]
             meta_grammar::subscript_rule<
-                karma::domain, tag::confix<proto::_, proto::_>, 
+                karma::domain, tag::confix_tag<proto::_, proto::_>, 
                 confix_director, main_meta_grammar
             >
         >

Modified: trunk/boost/spirit/home/qi/auxiliary/meta_grammar.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/auxiliary/meta_grammar.hpp	(original)
+++ trunk/boost/spirit/home/qi/auxiliary/meta_grammar.hpp	2008-10-14 12:19:05 EDT (Tue, 14 Oct 2008)
@@ -73,7 +73,7 @@
             >
         // confix(..., ...)[...]
           , meta_grammar::subscript_rule<
-                qi::domain, tag::confix<proto::_, proto::_>, 
+                qi::domain, tag::confix_tag<proto::_, proto::_>, 
                 confix_director, main_meta_grammar
             >
         >

Modified: trunk/boost/spirit/home/support/auxiliary/confix.hpp
==============================================================================
--- trunk/boost/spirit/home/support/auxiliary/confix.hpp	(original)
+++ trunk/boost/spirit/home/support/auxiliary/confix.hpp	2008-10-14 12:19:05 EDT (Tue, 14 Oct 2008)
@@ -13,7 +13,7 @@
 {
     // This is the tag returned by the confix() function
     template <typename Prefix, typename Suffix>
-    struct confix
+    struct confix_tag
     {
         Prefix prefix;
         Suffix suffix;
@@ -27,11 +27,11 @@
     ///////////////////////////////////////////////////////////////////////////
     template <typename Prefix, typename Suffix = Prefix>
     struct confix_spec
-      : proto::terminal<tag::confix<Prefix, Suffix> >::type
+      : proto::terminal<tag::confix_tag<Prefix, Suffix> >::type
     {
     private:
         typedef typename 
-            proto::terminal<tag::confix<Prefix, Suffix> >::type
+            proto::terminal<tag::confix_tag<Prefix, Suffix> >::type
         base_type;
 
         base_type make_tag(Prefix const& prefix, Suffix const& suffix) const
@@ -51,11 +51,11 @@
         struct confix_extractor
         {
             template <typename Prefix, typename Suffix>
-            static Prefix const& prefix(tag::confix<Prefix, Suffix> const& c) 
+            static Prefix const& prefix(tag::confix_tag<Prefix, Suffix> const& c) 
             { return c.prefix; }
 
             template <typename Prefix, typename Suffix>
-            static Suffix const& suffix(tag::confix<Prefix, Suffix> const& c) 
+            static Suffix const& suffix(tag::confix_tag<Prefix, Suffix> const& c) 
             { return c.suffix; }
         };
     }