[Boost-commit] svn:boost r63304 - trunk/boost/msm/back

Subject: [Boost-commit] svn:boost r63304 - trunk/boost/msm/back
From: christophe.j.henry_at_[hidden]
Date: 2010-06-25 07:50:42

Author: chenry
Date: 2010-06-25 07:50:41 EDT (Fri, 25 Jun 2010)
New Revision: 63304
URL: http://svn.boost.org/trac/boost/changeset/63304

Log:
bugfix (wrong handling in case of transition conflict)
Text files modified: 
   trunk/boost/msm/back/favor_compile_time.hpp |     7 +++++--                                 
   1 files changed, 5 insertions(+), 2 deletions(-)

Modified: trunk/boost/msm/back/favor_compile_time.hpp
==============================================================================
--- trunk/boost/msm/back/favor_compile_time.hpp	(original)
+++ trunk/boost/msm/back/favor_compile_time.hpp	2010-06-25 07:50:41 EDT (Fri, 25 Jun 2010)
@@ -91,8 +91,11 @@
             while (it != one_state.end() && res != HANDLED_TRUE)
             {
                 HandledEnum handled = (*it)(fsm,region,state,evt);
-                res = ((HANDLED_GUARD_REJECT==handled) || (HANDLED_GUARD_REJECT==res))?
-                      HANDLED_GUARD_REJECT:handled;
+                // reject is considered as erasing an error (HANDLED_FALSE)
+                if ((HANDLED_FALSE==handled) && (HANDLED_GUARD_REJECT==res) )
+                    res = HANDLED_GUARD_REJECT;
+                else
+                    res = handled;
                 ++it;
             }
             return res;