Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r58439 - in trunk/boost/spirit/home: karma/detail qi qi/detail
From: hartmut.kaiser_at_[hidden]
Date: 2009-12-17 12:14:31


Author: hkaiser
Date: 2009-12-17 12:14:31 EST (Thu, 17 Dec 2009)
New Revision: 58439
URL: http://svn.boost.org/trac/boost/changeset/58439

Log:
Spirit: fixing more g++ compilation problems
Text files modified:
   trunk/boost/spirit/home/karma/detail/generate_auto.hpp | 2 +-
   trunk/boost/spirit/home/qi/detail/parse.hpp | 8 ++++----
   trunk/boost/spirit/home/qi/detail/parse_auto.hpp | 4 ++--
   trunk/boost/spirit/home/qi/parse.hpp | 4 ++--
   4 files changed, 9 insertions(+), 9 deletions(-)

Modified: trunk/boost/spirit/home/karma/detail/generate_auto.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/detail/generate_auto.hpp (original)
+++ trunk/boost/spirit/home/karma/detail/generate_auto.hpp 2009-12-17 12:14:31 EST (Thu, 17 Dec 2009)
@@ -32,7 +32,7 @@
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename Expr>
- struct generate_delimited<Expr
+ struct generate_delimited_impl<Expr
       , typename enable_if<traits::meta_create_exists<karma::domain, Expr> >::type>
     {
         template <typename OutputIterator, typename Delimiter>

Modified: trunk/boost/spirit/home/qi/detail/parse.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/detail/parse.hpp (original)
+++ trunk/boost/spirit/home/qi/detail/parse.hpp 2009-12-17 12:14:31 EST (Thu, 17 Dec 2009)
@@ -22,7 +22,7 @@
 {
     ///////////////////////////////////////////////////////////////////////////
     template <typename Expr, typename Enable = void>
- struct parse
+ struct parse_impl
     {
         // Report invalid expression error as early as possible.
         // If you got an error_invalid_expression error message here,
@@ -33,7 +33,7 @@
     };
 
     template <typename Expr>
- struct parse<Expr
+ struct parse_impl<Expr
       , typename enable_if<traits::matches<qi::domain, Expr> >::type>
     {
         template <typename Iterator>
@@ -49,7 +49,7 @@
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename Expr, typename Enable = void>
- struct phrase_parse
+ struct phrase_parse_impl
     {
         // Report invalid expression error as early as possible.
         // If you got an error_invalid_expression error message here,
@@ -60,7 +60,7 @@
     };
 
     template <typename Expr>
- struct phrase_parse<Expr
+ struct phrase_parse_impl<Expr
       , typename enable_if<traits::matches<qi::domain, Expr> >::type>
     {
         template <typename Iterator, typename Skipper>

Modified: trunk/boost/spirit/home/qi/detail/parse_auto.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/detail/parse_auto.hpp (original)
+++ trunk/boost/spirit/home/qi/detail/parse_auto.hpp 2009-12-17 12:14:31 EST (Thu, 17 Dec 2009)
@@ -21,7 +21,7 @@
 {
     ///////////////////////////////////////////////////////////////////////////
     template <typename Expr>
- struct parse<Expr
+ struct parse_impl<Expr
       , typename enable_if<traits::meta_create_exists<qi::domain, Expr> >::type>
     {
         template <typename Iterator>
@@ -37,7 +37,7 @@
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename Expr>
- struct phrase_parse<Expr
+ struct phrase_parse_impl<Expr
       , typename enable_if<traits::meta_create_exists<qi::domain, Expr> >::type>
     {
         template <typename Iterator, typename Skipper>

Modified: trunk/boost/spirit/home/qi/parse.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/parse.hpp (original)
+++ trunk/boost/spirit/home/qi/parse.hpp 2009-12-17 12:14:31 EST (Thu, 17 Dec 2009)
@@ -24,7 +24,7 @@
       , Iterator last
       , Expr const& expr)
     {
- return detail::parse<Expr>::call(first, last, expr);
+ return detail::parse_impl<Expr>::call(first, last, expr);
     }
 
     template <typename Iterator, typename Expr, typename Attr>
@@ -52,7 +52,7 @@
       , Skipper const& skipper
       , BOOST_SCOPED_ENUM(skip_flag) post_skip = skip_flag::postskip)
     {
- return detail::phrase_parse<Expr>::call(
+ return detail::phrase_parse_impl<Expr>::call(
             first, last, expr, skipper, post_skip);
     }
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk