[Boost-commit] svn:boost r52645 - trunk/libs/spirit/example/karma

Subject: [Boost-commit] svn:boost r52645 - trunk/libs/spirit/example/karma
From: hartmut.kaiser_at_[hidden]
Date: 2009-04-27 22:07:07

Author: hkaiser
Date: 2009-04-27 22:07:06 EDT (Mon, 27 Apr 2009)
New Revision: 52645
URL: http://svn.boost.org/trac/boost/changeset/52645

Log:
Spirit: Karma examples now compile using gcc 4.4
Text files modified: 
   trunk/libs/spirit/example/karma/calc2_ast.hpp      |    12 ++++++------                            
   trunk/libs/spirit/example/karma/calc2_ast_dump.cpp |     1 +                                       
   2 files changed, 7 insertions(+), 6 deletions(-)

Modified: trunk/libs/spirit/example/karma/calc2_ast.hpp
==============================================================================
--- trunk/libs/spirit/example/karma/calc2_ast.hpp	(original)
+++ trunk/libs/spirit/example/karma/calc2_ast.hpp	2009-04-27 22:07:06 EDT (Mon, 27 Apr 2009)
@@ -18,7 +18,7 @@
 #if !defined(SPIRIT_EXAMPLE_CALC2_AST_APR_30_2008_1011AM)
 #define SPIRIT_EXAMPLE_CALC2_AST_APR_30_2008_1011AM
 
-#include <boost/variant/recursive_variant.hpp>
+#include <boost/variant.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
 #include <boost/spirit/include/phoenix_statement.hpp>
@@ -43,10 +43,10 @@
 
     // expose variant types 
     typedef type::types types;
-    
+
     // expose variant functionality
     int which() const { return expr.which(); }
-    
+
     // constructors
     expression_ast()
       : expr(nil()) {}
@@ -59,10 +59,10 @@
 
     expression_ast(unsigned int expr)
       : expr(expr) {}
-      
+
     expression_ast(type const& expr)
       : expr(expr) {}
-      
+
     expression_ast& operator+=(expression_ast const& rhs);
     expression_ast& operator-=(expression_ast const& rhs);
     expression_ast& operator*=(expression_ast const& rhs);
@@ -82,7 +82,7 @@
 struct binary_op
 {
     binary_op() {}
-    
+
     binary_op(
         char op
       , expression_ast const& left

Modified: trunk/libs/spirit/example/karma/calc2_ast_dump.cpp
==============================================================================
--- trunk/libs/spirit/example/karma/calc2_ast_dump.cpp	(original)
+++ trunk/libs/spirit/example/karma/calc2_ast_dump.cpp	2009-04-27 22:07:06 EDT (Mon, 27 Apr 2009)
@@ -15,6 +15,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 #include <boost/config/warning_disable.hpp>
+
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/karma.hpp>