[Boost-commit] svn:boost r73578 - in trunk/libs/spirit/example/qi/compiler_tutorial: conjure2 conjure3

Subject: [Boost-commit] svn:boost r73578 - in trunk/libs/spirit/example/qi/compiler_tutorial: conjure2 conjure3
From: hartmut.kaiser_at_[hidden]
Date: 2011-08-06 14:33:41

Author: hkaiser
Date: 2011-08-06 14:33:40 EDT (Sat, 06 Aug 2011)
New Revision: 73578
URL: http://svn.boost.org/trac/boost/changeset/73578

Log:
Spirit: fixing  compilation problems
Text files modified: 
   trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/function_def.hpp  |     1 -                                       
   trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/lexer.hpp         |     4 ++--                                    
   trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/statement_def.hpp |     1 -                                       
   trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/function_def.hpp  |     1 -                                       
   trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/lexer.hpp         |     4 ++--                                    
   trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/statement_def.hpp |     1 -                                       
   6 files changed, 4 insertions(+), 8 deletions(-)

Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/function_def.hpp
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/function_def.hpp	(original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/function_def.hpp	2011-08-06 14:33:40 EDT (Sat, 06 Aug 2011)
@@ -23,7 +23,6 @@
         qi::_4_type _4;
 
         qi::_val_type _val;
-        qi::token_type token;
 
         using qi::on_error;
         using qi::on_success;

Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/lexer.hpp
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/lexer.hpp	(original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/lexer.hpp	2011-08-06 14:33:40 EDT (Sat, 06 Aug 2011)
@@ -102,7 +102,7 @@
 
             typename keyword_map_type::const_iterator it = keywords_.find(kwd);
             BOOST_ASSERT(it != keywords_.end());
-            return qi::raw_token((it != keywords_.end()) ? (*it).second : token_ids::invalid);
+            return raw_token((it != keywords_.end()) ? (*it).second : token_ids::invalid);
         }
 
         // extract a token(id) for the given registered keyword
@@ -113,7 +113,7 @@
 
             typename keyword_map_type::const_iterator it = keywords_.find(kwd);
             BOOST_ASSERT(it != keywords_.end());
-            return qi::token((it != keywords_.end()) ? (*it).second : token_ids::invalid);
+            return token((it != keywords_.end()) ? (*it).second : token_ids::invalid);
         }
 
         lex::token_def<std::string> identifier;

Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/statement_def.hpp
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/statement_def.hpp	(original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure2/statement_def.hpp	2011-08-06 14:33:40 EDT (Sat, 06 Aug 2011)
@@ -23,7 +23,6 @@
         qi::_4_type _4;
 
         qi::_val_type _val;
-        qi::raw_token_type raw_token;
 
         using qi::on_error;
         using qi::on_success;

Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/function_def.hpp
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/function_def.hpp	(original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/function_def.hpp	2011-08-06 14:33:40 EDT (Sat, 06 Aug 2011)
@@ -23,7 +23,6 @@
         qi::_4_type _4;
 
         qi::_val_type _val;
-        qi::token_type token;
 
         using qi::on_error;
         using qi::on_success;

Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/lexer.hpp
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/lexer.hpp	(original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/lexer.hpp	2011-08-06 14:33:40 EDT (Sat, 06 Aug 2011)
@@ -118,7 +118,7 @@
 
             typename keyword_map_type::const_iterator it = keywords_.find(kwd);
             BOOST_ASSERT(it != keywords_.end());
-            return qi::raw_token((it != keywords_.end()) ? (*it).second : token_ids::invalid);
+            return raw_token((it != keywords_.end()) ? (*it).second : token_ids::invalid);
         }
 
         // extract a token(id) for the given registered keyword
@@ -129,7 +129,7 @@
 
             typename keyword_map_type::const_iterator it = keywords_.find(kwd);
             BOOST_ASSERT(it != keywords_.end());
-            return qi::token((it != keywords_.end()) ? (*it).second : token_ids::invalid);
+            return token((it != keywords_.end()) ? (*it).second : token_ids::invalid);
         }
 
         lex::token_def<std::string> identifier;

Modified: trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/statement_def.hpp
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/statement_def.hpp	(original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/conjure3/statement_def.hpp	2011-08-06 14:33:40 EDT (Sat, 06 Aug 2011)
@@ -23,7 +23,6 @@
         qi::_4_type _4;
 
         qi::_val_type _val;
-        qi::raw_token_type raw_token;
         qi::tokenid_mask_type tokenid_mask;
 
         using qi::on_error;