Boost logo

Boost-Commit :

From: hartmut.kaiser_at_[hidden]
Date: 2008-05-10 13:19:16


Author: hkaiser
Date: 2008-05-10 13:19:15 EDT (Sat, 10 May 2008)
New Revision: 45267
URL: http://svn.boost.org/trac/boost/changeset/45267

Log:
Spirit: Fixed gcc compilation problems.
Text files modified:
   trunk/boost/spirit/home/karma/nonterminal/nonterminal_director.hpp | 4 ++--
   trunk/boost/spirit/home/support/detail/action_dispatch.hpp | 18 +++++-------------
   2 files changed, 7 insertions(+), 15 deletions(-)

Modified: trunk/boost/spirit/home/karma/nonterminal/nonterminal_director.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/nonterminal/nonterminal_director.hpp (original)
+++ trunk/boost/spirit/home/karma/nonterminal/nonterminal_director.hpp 2008-05-10 13:19:15 EDT (Sat, 10 May 2008)
@@ -53,7 +53,7 @@
             Parameter const& param)
         {
             typedef typename Nonterminal::locals_type locals_type;
- fusion::vector<Parameter const&> front(param);
+ fusion::single_view<Parameter const&> front(param);
             NonterminalContext context(front, locals_type());
             return x.obj.generate(sink, context, delim);
         }
@@ -69,7 +69,7 @@
             Parameter const& param)
         {
             typedef typename Nonterminal::locals_type locals_type;
- fusion::vector<Parameter const&> front(param);
+ fusion::single_view<Parameter const&> front(param);
             NonterminalContext context(front, locals_type());
             return ptr->generate(sink, context, delim);
         }

Modified: trunk/boost/spirit/home/support/detail/action_dispatch.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/action_dispatch.hpp (original)
+++ trunk/boost/spirit/home/support/detail/action_dispatch.hpp 2008-05-10 13:19:15 EDT (Sat, 10 May 2008)
@@ -16,7 +16,7 @@
 {
     // general handler for everything not explicitly specialized below
     template <typename F, typename Attribute, typename Context, typename Pass>
- bool action_dispatch(F const& f, Attribute& attr, Context& context, Pass&)
+ bool action_dispatch(F const& f, Attribute& attr, Context& context, Pass)
     {
         bool pass = true;
         f(attr, context, pass);
@@ -50,20 +50,12 @@
         return pass;
     }
 
-// template <typename Eval, typename Attribute, typename Context,
-// typename IsSequence>
-// bool action_dispatch(phoenix::actor<Eval> const& f
-// , Attribute& attr, Context& context, IsSe&)
-// {
-// return action_dispatch_impl(f, attr, context, IsSequence());
-// }
-
     // specializations for plain function pointers taking a different number of
     // arguments
     template <typename RT, typename A0, typename A1, typename A2
       , typename Attribute, typename Context, typename Pass>
     bool action_dispatch(RT(*f)(A0, A1, A2)
- , Attribute& attr, Context& context, Pass&)
+ , Attribute& attr, Context& context, Pass)
     {
         bool pass = true;
         f(attr, context, pass);
@@ -73,7 +65,7 @@
     template <typename RT, typename A0, typename A1
       , typename Attribute, typename Context, typename Pass>
     bool action_dispatch(RT(*f)(A0, A1)
- , Attribute& attr, Context& context, Pass&)
+ , Attribute& attr, Context& context, Pass)
     {
         f(attr, context);
         return true;
@@ -82,7 +74,7 @@
     template <typename RT, typename A0
       , typename Attribute, typename Context, typename Pass>
     bool action_dispatch(RT(*f)(A0)
- , Attribute& attr, Context&, Pass&)
+ , Attribute& attr, Context&, Pass)
     {
         f(attr);
         return true;
@@ -90,7 +82,7 @@
 
     template <typename RT, typename Attribute, typename Context, typename Pass>
     bool action_dispatch(RT(*f)()
- , Attribute&, Context&, Pass&)
+ , Attribute&, Context&, Pass)
     {
         f();
         return true;


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