[Boost-commit] svn:boost r61514 - in trunk/boost/spirit/home: karma/nonterminal qi/nonterminal

Subject: [Boost-commit] svn:boost r61514 - in trunk/boost/spirit/home: karma/nonterminal qi/nonterminal
From: hartmut.kaiser_at_[hidden]
Date: 2010-04-23 17:17:26

Author: hkaiser
Date: 2010-04-23 17:17:25 EDT (Fri, 23 Apr 2010)
New Revision: 61514
URL: http://svn.boost.org/trac/boost/changeset/61514

Log:
Spirit: fixed problem with qi and karma debug_handler
Text files modified: 
   trunk/boost/spirit/home/karma/nonterminal/debug_handler.hpp |    18 +++++++++---------                      
   trunk/boost/spirit/home/qi/nonterminal/debug_handler.hpp    |    18 +++++++++---------                      
   2 files changed, 18 insertions(+), 18 deletions(-)

Modified: trunk/boost/spirit/home/karma/nonterminal/debug_handler.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/nonterminal/debug_handler.hpp	(original)
+++ trunk/boost/spirit/home/karma/nonterminal/debug_handler.hpp	2010-04-23 17:17:25 EDT (Fri, 23 Apr 2010)
@@ -67,12 +67,11 @@
         std::string rule_name;
     };
 
-    template <
-        typename OutputIterator, typename T0, typename T1, typename T2
-      , typename F>
-    void debug(rule<OutputIterator, T0, T1, T2>& r, F f)
+    template <typename OutputIterator
+      , typename T1, typename T2, typename T3, typename T4, typename F>
+    void debug(rule<OutputIterator, T1, T2, T3, T4>& r, F f)
     {
-        typedef rule<OutputIterator, T0, T1, T2> rule_type;
+        typedef rule<OutputIterator, T1, T2, T3, T4> rule_type;
 
         typedef
             debug_handler<
@@ -87,10 +86,11 @@
 
     struct simple_trace;
 
-    template <typename OutputIterator, typename T0, typename T1, typename T2>
-    void debug(rule<OutputIterator, T0, T1, T2>& r)
+    template <typename OutputIterator
+      , typename T1, typename T2, typename T3, typename T4>
+    void debug(rule<OutputIterator, T1, T2, T3, T4>& r)
     {
-        typedef rule<OutputIterator, T0, T1, T2> rule_type;
+        typedef rule<OutputIterator, T1, T2, T3, T4> rule_type;
 
         typedef
             debug_handler<
@@ -111,7 +111,7 @@
   #if defined(BOOST_SPIRIT_KARMA_DEBUG)
     #define BOOST_SPIRIT_DEBUG_NODE(r)  r.name(#r); debug(r)
   #else
-    #define BOOST_SPIRIT_DEBUG_NODE(r)
+    #define BOOST_SPIRIT_DEBUG_NODE(r)  r.name(#r);
   #endif
 #endif
 

Modified: trunk/boost/spirit/home/qi/nonterminal/debug_handler.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/nonterminal/debug_handler.hpp	(original)
+++ trunk/boost/spirit/home/qi/nonterminal/debug_handler.hpp	2010-04-23 17:17:25 EDT (Fri, 23 Apr 2010)
@@ -72,12 +72,11 @@
         std::string rule_name;
     };
 
-    template <
-        typename Iterator, typename T0, typename T1, typename T2
-      , typename F>
-    void debug(rule<Iterator, T0, T1, T2>& r, F f)
+    template <typename OutputIterator
+      , typename T1, typename T2, typename T3, typename T4, typename F>
+    void debug(rule<Iterator, T1, T2, T3, T4>& r, F f)
     {
-        typedef rule<Iterator, T0, T1, T2> rule_type;
+        typedef rule<Iterator, T1, T2, T3, T4> rule_type;
 
         typedef
             debug_handler<
@@ -91,10 +90,11 @@
 
     struct simple_trace;
 
-    template <typename Iterator, typename T0, typename T1, typename T2>
-    void debug(rule<Iterator, T0, T1, T2>& r)
+    template <typename OutputIterator
+      , typename T1, typename T2, typename T3, typename T4>
+    void debug(rule<Iterator, T1, T2, T3, T4>& r)
     {
-        typedef rule<Iterator, T0, T1, T2> rule_type;
+        typedef rule<Iterator, T1, T2, T3, T4> rule_type;
 
         typedef
             debug_handler<
@@ -114,7 +114,7 @@
   #if defined(BOOST_SPIRIT_DEBUG) || defined(BOOST_SPIRIT_QI_DEBUG)
     #define BOOST_SPIRIT_DEBUG_NODE(r)  r.name(#r); debug(r)
   #else
-    #define BOOST_SPIRIT_DEBUG_NODE(r)
+    #define BOOST_SPIRIT_DEBUG_NODE(r)  r.name(#r);
   #endif
 #endif