Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r69861 - branches/msm/v2_30/boost/msm/lpp
From: christophe.j.henry_at_[hidden]
Date: 2011-03-11 18:33:26

Author: chenry
Date: 2011-03-11 18:33:22 EST (Fri, 11 Mar 2011)
New Revision: 69861
URL: http://svn.boost.org/trac/boost/changeset/69861

Log:
bugfixes
Text files modified:
   branches/msm/v2_30/boost/msm/lpp/function.hpp | 7 +++++--
   branches/msm/v2_30/boost/msm/lpp/operator.hpp | 2 +-
   2 files changed, 6 insertions(+), 3 deletions(-)

Modified: branches/msm/v2_30/boost/msm/lpp/function.hpp
==============================================================================
--- branches/msm/v2_30/boost/msm/lpp/function.hpp (original)
+++ branches/msm/v2_30/boost/msm/lpp/function.hpp 2011-03-11 18:33:22 EST (Fri, 11 Mar 2011)
@@ -28,13 +28,16 @@
     template<class This,class B, class A0> \
     struct result<This(B& block,A0& a0)> \
     { \
- BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested,userfunc()) \
+ static A0& a0; \
+ BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested,userfunc(a0)) \
         typedef typename nested::type type; \
     }; \
     template<class This,class B, class A0, class A1> \
     struct result<This(B& block,A0& a0,A1& a1)> \
     { \
- BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested,userfunc()) \
+ static A0& a0; \
+ static A1& a1; \
+ BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested,userfunc(a0,a1)) \
         typedef typename nested::type type; \
     }; \
     template<typename B,typename A0> \

Modified: branches/msm/v2_30/boost/msm/lpp/operator.hpp
==============================================================================
--- branches/msm/v2_30/boost/msm/lpp/operator.hpp (original)
+++ branches/msm/v2_30/boost/msm/lpp/operator.hpp 2011-03-11 18:33:22 EST (Fri, 11 Mar 2011)
@@ -96,7 +96,7 @@
         static B& block; \
         BOOST_PP_REPEAT(n, BOOST_MSM_LPP_ARGS_HELPER2, ~) \
         BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested,BOOST_PP_TUPLE_ELEM(2, 1, data)T1()(block BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, BOOST_MSM_LPP_ARGS_HELPER3, ~ )) ) \
- typedef typename nested::type type; \
+ typedef typename nested::type& type; \
     }; \
     template<typename B BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, class ARG)> \
     typename boost::result_of<BOOST_PP_TUPLE_ELEM(2, 0, data)(B& BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM(n, BOOST_MSM_LPP_ARGS_HELPER4, ~ ) )>::type \

Date view	Thread view	Subject view	Author view

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