[Boost-commit] svn:boost r42459 - trunk/boost/statechart

From: ahd6974-boostorg_at_[hidden]
Date: 2008-01-04 13:23:18

Author: andreas_huber69
Date: 2008-01-04 13:23:18 EST (Fri, 04 Jan 2008)
New Revision: 42459
URL: http://svn.boost.org/trac/boost/changeset/42459

Log:
This should fix template parameter shadowing errors for gcc and Intel compilers.
Text files modified: 
   trunk/boost/statechart/transition.hpp |    14 ++++++--------                          
   1 files changed, 6 insertions(+), 8 deletions(-)

Modified: trunk/boost/statechart/transition.hpp
==============================================================================
--- trunk/boost/statechart/transition.hpp	(original)
+++ trunk/boost/statechart/transition.hpp	2008-01-04 13:23:18 EST (Fri, 04 Jan 2008)
@@ -30,9 +30,7 @@
 {
   private:
     //////////////////////////////////////////////////////////////////////////
-    template<
-      class State, class ActionContext,
-      void ( ActionContext::*pAction )( const Event & ), class Destination >
+    template< class State >
     struct reactions
     {
       static result react_without_action( State & stt )
@@ -40,10 +38,10 @@
         return stt.template transit< Destination >();
       }
 
-      template< class Event >
-      static result react_with_action( State & stt, const Event & evt )
+      template< class Event2 >
+      static result react_with_action( State & stt, const Event2 & evt )
       {
-        return stt.template transit< Destination >( pAction, evt );
+        return stt.template transit< Destination >( pTransitionAction, evt );
       }
     };
 
@@ -57,8 +55,8 @@
       State & stt, const EventBase & evt, const IdType & eventType )
     {
       typedef detail::reaction_dispatcher<
-        reactions< State, TransitionContext, pTransitionAction, Destination >,
-        State, EventBase, Event, TransitionContext, IdType > dispatcher;
+        reactions< State >, State, EventBase, Event, TransitionContext, IdType
+      > dispatcher;
       return dispatcher::react( stt, evt, eventType );
     }
 };