Boost logo

Boost-Commit :

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


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

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

Modified: trunk/boost/spirit/home/karma/detail/generate.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/detail/generate.hpp (original)
+++ trunk/boost/spirit/home/karma/detail/generate.hpp 2009-12-17 12:12:36 EST (Thu, 17 Dec 2009)
@@ -22,7 +22,7 @@
 {
     ///////////////////////////////////////////////////////////////////////////
     template <typename Expr, typename Enable = void>
- struct generate
+ struct generate_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 generate<Expr
+ struct generate_impl<Expr
       , typename enable_if<traits::matches<karma::domain, Expr> >::type>
     {
         template <typename OutputIterator>
@@ -64,7 +64,7 @@
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename Expr, typename Enable = void>
- struct generate_delimited
+ struct generate_delimited_impl
     {
         // Report invalid expression error as early as possible.
         // If you got an error_invalid_expression error message here,
@@ -75,7 +75,7 @@
     };
 
     template <typename Expr>
- struct generate_delimited<Expr
+ struct generate_delimited_impl<Expr
       , typename enable_if<traits::matches<karma::domain, Expr> >::type>
     {
         template <typename OutputIterator, typename Delimiter>

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:12:36 EST (Thu, 17 Dec 2009)
@@ -18,7 +18,7 @@
 {
     ///////////////////////////////////////////////////////////////////////////
     template <typename Expr>
- struct generate<Expr
+ struct generate_impl<Expr
       , typename enable_if<traits::meta_create_exists<karma::domain, Expr> >::type>
     {
         template <typename OutputIterator>

Modified: trunk/boost/spirit/home/karma/generate.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/generate.hpp (original)
+++ trunk/boost/spirit/home/karma/generate.hpp 2009-12-17 12:12:36 EST (Thu, 17 Dec 2009)
@@ -21,7 +21,7 @@
         OutputIterator& sink
       , Expr const& expr)
     {
- return detail::generate<Expr>::call(sink, expr);
+ return detail::generate_impl<Expr>::call(sink, expr);
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@
       , BOOST_SCOPED_ENUM(delimit_flag) pre_delimit =
             delimit_flag::dont_predelimit)
     {
- return detail::generate_delimited<Expr>::call(
+ return detail::generate_delimited_impl<Expr>::call(
             sink, expr, delimiter, pre_delimit);
     }
 


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