[Boost-commit] svn:boost r49880 - in trunk/boost/proto: . transform

Subject: [Boost-commit] svn:boost r49880 - in trunk/boost/proto: . transform
From: eric_at_[hidden]
Date: 2008-11-22 20:04:53

Author: eric_niebler
Date: 2008-11-22 20:04:53 EST (Sat, 22 Nov 2008)
New Revision: 49880
URL: http://svn.boost.org/trac/boost/changeset/49880

Log:
fix proto::call for callable transforms with >3 arguments, remove unnecessary semicolons from make_expr.hpp, fixes #2529
Text files modified: 
   trunk/boost/proto/make_expr.hpp      |     6 +++---                                  
   trunk/boost/proto/transform/call.hpp |     3 ++-                                     
   2 files changed, 5 insertions(+), 4 deletions(-)

Modified: trunk/boost/proto/make_expr.hpp
==============================================================================
--- trunk/boost/proto/make_expr.hpp	(original)
+++ trunk/boost/proto/make_expr.hpp	2008-11-22 20:04:53 EST (Sat, 22 Nov 2008)
@@ -524,7 +524,7 @@
                 {
                     proto::expr<tag::terminal, Args, 0> that = {this->a0};
                     return that;
-                };
+                }
 
                 template<typename Expr>
                 operator Expr() const
@@ -558,7 +558,7 @@
                 {
                     proto::expr<Tag, Args, 1> that = {this->a0};
                     return that;
-                };
+                }
 
                 template<typename Expr>
                 operator Expr() const
@@ -1087,7 +1087,7 @@
                 #undef M0
                 proto::expr<Tag, Args, N> that = {BOOST_PP_ENUM_PARAMS(N, c)};
                 return that;
-            };
+            }
 
             template<typename Expr>
             operator Expr() const

Modified: trunk/boost/proto/transform/call.hpp
==============================================================================
--- trunk/boost/proto/transform/call.hpp	(original)
+++ trunk/boost/proto/transform/call.hpp	2008-11-22 20:04:53 EST (Sat, 22 Nov 2008)
@@ -411,7 +411,8 @@
                     #define M0(Z, M, DATA)                                                          \
                         detail::as_lvalue(                                                          \
                             typename when<_, BOOST_PP_CAT(A, M)>                                    \
-                                ::template impl<Expr, State, Data>()(e, s, d))            \
+                                ::template impl<Expr, State, Data>()(e, s, d))                      \
+                        /**/
                     return mono_fun()(BOOST_PP_ENUM(N, M0, ~));
                     #undef M0
                 }