[Boost-commit] svn:boost r83757 - in branches/release/boost/msm: . back front front/detail front/euml mpl_graph

Subject: [Boost-commit] svn:boost r83757 - in branches/release/boost/msm: . back front front/detail front/euml mpl_graph
From: christophe.j.henry_at_[hidden]
Date: 2013-04-03 16:59:05

Author: chenry
Date: 2013-04-03 16:59:05 EDT (Wed, 03 Apr 2013)
New Revision: 83757
URL: http://svn.boost.org/trac/boost/changeset/83757

Log:
Merged rev. 82588-83755
Properties modified: 
   branches/release/boost/msm/   (props changed)
   branches/release/boost/msm/active_state_switching_policies.hpp   (props changed)
   branches/release/boost/msm/back/   (props changed)
   branches/release/boost/msm/back/args.hpp   (props changed)
   branches/release/boost/msm/back/bind_helpers.hpp   (props changed)
   branches/release/boost/msm/back/common_types.hpp   (props changed)
   branches/release/boost/msm/back/copy_policies.hpp   (props changed)
   branches/release/boost/msm/back/default_compile_policy.hpp   (props changed)
   branches/release/boost/msm/back/dispatch_table.hpp   (props changed)
   branches/release/boost/msm/back/favor_compile_time.hpp   (contents, props changed)
   branches/release/boost/msm/back/fold_to_list.hpp   (props changed)
   branches/release/boost/msm/back/history_policies.hpp   (props changed)
   branches/release/boost/msm/back/metafunctions.hpp   (props changed)
   branches/release/boost/msm/back/mpl_graph_fsm_check.hpp   (props changed)
   branches/release/boost/msm/back/no_fsm_check.hpp   (props changed)
   branches/release/boost/msm/back/queue_container_circular.hpp   (props changed)
   branches/release/boost/msm/back/queue_container_deque.hpp   (props changed)
   branches/release/boost/msm/back/state_machine.hpp   (contents, props changed)
   branches/release/boost/msm/back/tools.hpp   (props changed)
   branches/release/boost/msm/common.hpp   (props changed)
   branches/release/boost/msm/event_traits.hpp   (props changed)
   branches/release/boost/msm/front/   (props changed)
   branches/release/boost/msm/front/common_states.hpp   (props changed)
   branches/release/boost/msm/front/completion_event.hpp   (props changed)
   branches/release/boost/msm/front/detail/   (props changed)
   branches/release/boost/msm/front/detail/common_states.hpp   (props changed)
   branches/release/boost/msm/front/detail/row2_helper.hpp   (props changed)
   branches/release/boost/msm/front/euml/   (props changed)
   branches/release/boost/msm/front/euml/algorithm.hpp   (props changed)
   branches/release/boost/msm/front/euml/common.hpp   (props changed)
   branches/release/boost/msm/front/euml/container.hpp   (props changed)
   branches/release/boost/msm/front/euml/euml.hpp   (props changed)
   branches/release/boost/msm/front/euml/euml_typeof.hpp   (props changed)
   branches/release/boost/msm/front/euml/guard_grammar.hpp   (props changed)
   branches/release/boost/msm/front/euml/iteration.hpp   (props changed)
   branches/release/boost/msm/front/euml/operator.hpp   (props changed)
   branches/release/boost/msm/front/euml/phoenix_placeholders.hpp   (props changed)
   branches/release/boost/msm/front/euml/querying.hpp   (props changed)
   branches/release/boost/msm/front/euml/state_grammar.hpp   (props changed)
   branches/release/boost/msm/front/euml/stl.hpp   (props changed)
   branches/release/boost/msm/front/euml/stt_grammar.hpp   (props changed)
   branches/release/boost/msm/front/euml/transformation.hpp   (props changed)
   branches/release/boost/msm/front/functor_row.hpp   (props changed)
   branches/release/boost/msm/front/internal_row.hpp   (props changed)
   branches/release/boost/msm/front/row2.hpp   (props changed)
   branches/release/boost/msm/front/state_machine_def.hpp   (props changed)
   branches/release/boost/msm/front/states.hpp   (props changed)
   branches/release/boost/msm/mpl_graph/   (props changed)
   branches/release/boost/msm/msm_grammar.hpp   (props changed)
   branches/release/boost/msm/proto_config.hpp   (props changed)
   branches/release/boost/msm/row_tags.hpp   (props changed)
Text files modified: 
   branches/release/boost/msm/back/favor_compile_time.hpp |     3 ++-                                     
   branches/release/boost/msm/back/state_machine.hpp      |     6 ++++--                                  
   2 files changed, 6 insertions(+), 3 deletions(-)

Modified: branches/release/boost/msm/back/favor_compile_time.hpp
==============================================================================
--- branches/release/boost/msm/back/favor_compile_time.hpp	(original)
+++ branches/release/boost/msm/back/favor_compile_time.hpp	2013-04-03 16:59:05 EDT (Wed, 03 Apr 2013)
@@ -38,7 +38,8 @@
         if ( ! finished && ::boost::any_cast<Event>(&any_event)!=0)
         {
             finished = true;
-            res = self->process_event(::boost::any_cast<Event>(any_event));
+            res = self->process_event_internal(::boost::any_cast<Event>(any_event),false);
+ 
         }
     }
 private:

Modified: branches/release/boost/msm/back/state_machine.hpp
==============================================================================
--- branches/release/boost/msm/back/state_machine.hpp	(original)
+++ branches/release/boost/msm/back/state_machine.hpp	2013-04-03 16:59:05 EDT (Wed, 03 Apr 2013)
@@ -332,7 +332,9 @@
         }
         void set_forward_fct(::boost::function<execute_return (Event const&)> fct)
         {
-            m_forward = fct;
+            // if we already have a forward, we never overwrite it
+            if (!m_forward.empty())
+                m_forward = fct;
         }    
         exit_pt():m_forward(){}
         // by assignments, we keep our forwarding functor unchanged as our containing SM did not change
@@ -1971,7 +1973,7 @@
                 ret_handled = handled;
             }
 
-            // process completion transitions BEFORE any other event in the pool (UML Standard 2.3 §15.3.14)
+            // process completion transitions BEFORE any other event in the pool (UML Standard 2.3 15.3.14)
             handle_eventless_transitions_helper<library_sm> eventless_helper(this,(handled == HANDLED_TRUE));
             eventless_helper.process_completion_event();