[Boost-commit] svn:boost r63721 - trunk/libs/spirit/example/scheme/test/qi

Subject: [Boost-commit] svn:boost r63721 - trunk/libs/spirit/example/scheme/test/qi
From: hartmut.kaiser_at_[hidden]
Date: 2010-07-07 09:23:27

Author: hkaiser
Date: 2010-07-07 09:23:27 EDT (Wed, 07 Jul 2010)
New Revision: 63721
URL: http://svn.boost.org/trac/boost/changeset/63721

Log:
Spirit: Fixing merge problem 
Text files modified: 
   trunk/libs/spirit/example/scheme/test/qi/qi_interpreter.cpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/libs/spirit/example/scheme/test/qi/qi_interpreter.cpp
==============================================================================
--- trunk/libs/spirit/example/scheme/test/qi/qi_interpreter.cpp	(original)
+++ trunk/libs/spirit/example/scheme/test/qi/qi_interpreter.cpp	2010-07-07 09:23:27 EDT (Wed, 07 Jul 2010)
@@ -50,9 +50,6 @@
         int new_rule()
         {
             rules[index];
-            std::stringstream str;
-            str << qi::what(expr);
-            rules[index].name(str.str());
             return index++;
         }
 
@@ -60,6 +57,9 @@
         void define_rule(int id, Expr const& expr)
         {
             rules[id] = expr;
+            std::stringstream str;
+            str << qi::what(expr);
+            rules[id].name(str.str());
         }
 
         Rule const& operator[](int id) const