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

Subject: [Boost-commit] svn:boost r83768 - trunk/boost/msm/back
From: christophe.j.henry_at_[hidden]
Date: 2013-04-04 15:28:25

Author: chenry
Date: 2013-04-04 15:28:24 EDT (Thu, 04 Apr 2013)
New Revision: 83768
URL: http://svn.boost.org/trac/boost/changeset/83768

Log:
fixed bug caused by tentative fix rev. 83480
Text files modified: 
   trunk/boost/msm/back/state_machine.hpp |     6 +-----                                  
   1 files changed, 1 insertions(+), 5 deletions(-)

Modified: trunk/boost/msm/back/state_machine.hpp
==============================================================================
--- trunk/boost/msm/back/state_machine.hpp	(original)
+++ trunk/boost/msm/back/state_machine.hpp	2013-04-04 15:28:24 EDT (Thu, 04 Apr 2013)
@@ -332,9 +332,7 @@
         }
         void set_forward_fct(::boost::function<execute_return (Event const&)> fct)
         {
-            // if we already have a forward, we never overwrite it
-            if (!m_forward.empty())
-                m_forward = fct;
+            m_forward = fct;
         }    
         exit_pt():m_forward(){}
         // by assignments, we keep our forwarding functor unchanged as our containing SM did not change
@@ -1654,8 +1652,6 @@
          if (this != &rhs) 
          {
             Derived::operator=(rhs);
-            // initialize our list of states with the ones defined in Derived::initial_state
-            fill_states(this);
             do_copy(rhs);
          }
         return *this;