Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r63077 - trunk/boost/msm/back
From: christophe.j.henry_at_[hidden]
Date: 2010-06-18 05:07:47


Author: chenry
Date: 2010-06-18 05:07:46 EDT (Fri, 18 Jun 2010)
New Revision: 63077
URL: http://svn.boost.org/trac/boost/changeset/63077

Log:
corrected error with Intel compiler
Text files modified:
   trunk/boost/msm/back/state_machine.hpp | 16 ++++++++--------
   1 files changed, 8 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-06-18 05:07:46 EDT (Fri, 18 Jun 2010)
@@ -1402,7 +1402,7 @@
                     table::instance.entries[self_->m_states[region_id::value]](
                     *self_, region_id::value , self_->m_states[region_id::value], evt);
                 result_ = (HandledEnum)((int)result_ | (int)res);
- In< ::boost::mpl::int_<region_id::value+1> >::template process(evt,self_,result_);
+ In< ::boost::mpl::int_<region_id::value+1> >::process(evt,self_,result_);
             }
         };
         template <int Dummy>
@@ -1420,7 +1420,7 @@
         {
             // use this table as if it came directly from the user
             typedef dispatch_table<library_sm,complete_table,Event,CompilePolicy> table;
- In< ::boost::mpl::int_<0> >::template process(evt,self,result);
+ In< ::boost::mpl::int_<0> >::process(evt,self,result);
         }
 
         library_sm* self;
@@ -1844,7 +1844,7 @@
              ::boost::mpl::for_each<state_list, ::boost::msm::wrap< ::boost::mpl::placeholders::_1> >
                  (entry_exit_helper<Event,true>(self_->m_states[region_id::value],incomingEvent,self_));
              region_start_helper
- < ::boost::mpl::int_<region_id::value+1> >::template do_start(self_,incomingEvent);
+ < ::boost::mpl::int_<region_id::value+1> >::do_start(self_,incomingEvent);
          }
      };
      template <int Dummy>
@@ -1858,7 +1858,7 @@
      template <class Event>
      void start(Event const& incomingEvent)
      {
- region_start_helper< ::boost::mpl::int_<0> >::template do_start(this,incomingEvent);
+ region_start_helper< ::boost::mpl::int_<0> >::do_start(this,incomingEvent);
      }
 
      // helper used to set the correct state as active state upon entry into a fsm
@@ -1966,7 +1966,7 @@
              self_->m_states[region_id::value] =
                  self_->m_history.history_entry(incomingEvent)[region_id::value];
              region_entry_exit_helper
- < ::boost::mpl::int_<region_id::value+1> >::template do_entry(self_,incomingEvent);
+ < ::boost::mpl::int_<region_id::value+1> >::do_entry(self_,incomingEvent);
          }
          template<class Event>
          static void do_exit(library_sm* self_,Event const& incomingEvent)
@@ -1974,7 +1974,7 @@
              ::boost::mpl::for_each<state_list, ::boost::msm::wrap< ::boost::mpl::placeholders::_1> >
                  (entry_exit_helper<Event,false>(self_->m_states[region_id::value],incomingEvent,self_));
              region_entry_exit_helper
- < ::boost::mpl::int_<region_id::value+1> >::template do_exit(self_,incomingEvent);
+ < ::boost::mpl::int_<region_id::value+1> >::do_exit(self_,incomingEvent);
          }
      };
      template <int Dummy>
@@ -1991,7 +1991,7 @@
      void do_entry(Event const& incomingEvent,FsmType& fsm)
      {
         // by default we activate the history/init states, can be overwritten by direct_event_start_helper
- region_entry_exit_helper< ::boost::mpl::int_<0> >::template do_entry(this,incomingEvent);
+ region_entry_exit_helper< ::boost::mpl::int_<0> >::do_entry(this,incomingEvent);
         // block immediate handling of events
         m_event_processing = true;
         // if the event is generating a direct entry/fork, set the current state(s) to the direct state(s)
@@ -2005,7 +2005,7 @@
      {
         // first recursively exit the sub machines
         // forward the event for handling by sub state machines
- region_entry_exit_helper< ::boost::mpl::int_<0> >::template do_exit(this,incomingEvent);
+ region_entry_exit_helper< ::boost::mpl::int_<0> >::do_exit(this,incomingEvent);
         // then call our own exit
         (static_cast<Derived*>(this))->on_exit(incomingEvent,fsm);
         // give the history a chance to handle this (or not).


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