Subject: [Boost-commit] svn:boost r63613 - trunk/boost/msm/back
From: christophe.j.henry_at_[hidden]
Date: 2010-07-04 13:10:53
Author: chenry
Date: 2010-07-04 13:10:50 EDT (Sun, 04 Jul 2010)
New Revision: 63613
URL: http://svn.boost.org/trac/boost/changeset/63613
Log:
fixed bug with explicit entries + internal transition
Text files modified:
trunk/boost/msm/back/state_machine.hpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
Modified: trunk/boost/msm/back/state_machine.hpp
==============================================================================
--- trunk/boost/msm/back/state_machine.hpp (original)
+++ trunk/boost/msm/back/state_machine.hpp 2010-07-04 13:10:50 EDT (Sun, 04 Jul 2010)
@@ -550,8 +550,8 @@
>
struct irow_
{
- typedef typename ROW::Source T1;
- typedef typename ROW::Target T2;
+ typedef typename make_entry<typename ROW::Source,library_sm>::type T1;
+ typedef typename make_exit<typename ROW::Target,library_sm>::type T2;
typedef typename ROW::Evt transition_event;
typedef T1 current_state_type;
typedef T2 next_state_type;
@@ -593,8 +593,8 @@
>
struct g_irow_
{
- typedef typename ROW::Source T1;
- typedef typename ROW::Target T2;
+ typedef typename make_entry<typename ROW::Source,library_sm>::type T1;
+ typedef typename make_exit<typename ROW::Target,library_sm>::type T2;
typedef typename ROW::Evt transition_event;
typedef T1 current_state_type;
typedef T2 next_state_type;
@@ -629,8 +629,9 @@
>
struct a_irow_
{
- typedef typename ROW::Source T1;
- typedef typename ROW::Target T2;
+ typedef typename make_entry<typename ROW::Source,library_sm>::type T1;
+ typedef typename make_exit<typename ROW::Target,library_sm>::type T2;
+
typedef typename ROW::Evt transition_event;
typedef T1 current_state_type;
typedef T2 next_state_type;
@@ -656,8 +657,8 @@
>
struct _irow_
{
- typedef typename ROW::Source T1;
- typedef typename ROW::Target T2;
+ typedef typename make_entry<typename ROW::Source,library_sm>::type T1;
+ typedef typename make_exit<typename ROW::Target,library_sm>::type T2;
typedef typename ROW::Evt transition_event;
typedef T1 current_state_type;
typedef T2 next_state_type;