From 5cde6ed0e56f75988d839094a4f18ad633548862 Mon Sep 17 00:00:00 2001
From: Petr Silhavik <silhavik.p@gmail.com>
Date: Wed, 14 Nov 2012 15:45:25 +0100
Subject: [PATCH] Transform to C++: Update TimedStates

---
 src/boostFSM/test/timed_fsm_test.cpp | 11 ++++++-----
 src/boostFSM/timedFSM.h              |  7 +++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/boostFSM/test/timed_fsm_test.cpp b/src/boostFSM/test/timed_fsm_test.cpp
index ce55a9ea..df770756 100644
--- a/src/boostFSM/test/timed_fsm_test.cpp
+++ b/src/boostFSM/test/timed_fsm_test.cpp
@@ -178,10 +178,6 @@ public:
 	MyStateMachine(my_context ctx) : my_base(ctx) {
 		printf("%s\n", __FUNCTION__);
 	}
-	void testik()
-	{
-		std::cout<<"testicek\n";
-	}
 };
 
 struct MyStateMachine2 : sc::asynchronous_state_machine<MyStateMachine2, State3, Scheduler>
@@ -212,7 +208,9 @@ struct globalState : TimedState<globalState, MyStateMachine, State1>
 	Timer t;
 	globalState(my_context ctx): base_state(ctx){
 		runTimer(t, 15000, new Ev3());
+		printf("%s\n", __FUNCTION__);
 	}
+	~globalState(){printf("%s\n", __FUNCTION__);}
 	typedef sc::custom_reaction< Ev3 > reactions;
 	sc::result react(const Ev3 &)
 	{
@@ -228,6 +226,7 @@ struct State1 : TimedState<State1, globalState>
 		printf("%s\n", __FUNCTION__);
 		runTimer(tim1, 200, new Ev1());
 	}
+	~State1() {printf("%s\n", __FUNCTION__);}
 	typedef sc::transition< Ev1, State2 > reactions;
 	
 };
@@ -242,6 +241,7 @@ struct State2 : TimedState<State2, globalState>
 		runTimer(time, 8000, new Ev2());
 		printf("%s\n", __FUNCTION__);
 	}
+	~State2() {printf("%s\n", __FUNCTION__);}
 	typedef sc::transition< Ev2, State1 > reactions;
 };
 
@@ -254,10 +254,10 @@ struct State3 : TimedState<State3, MyStateMachine2>
 		runTimer(time, 5000, new Ev1(&x));
 		printf("%s\n", __FUNCTION__);
 	}
+	~State3() {printf("%s\n", __FUNCTION__);}
 	typedef sc::custom_reaction< Ev1 > reactions;
 	sc::result react( const Ev1 & udalost)
 	{
-		if(udalost.x) std::cout<<*(udalost.x)<<"\n";
 		return transit<State4>();
 	}
 };
@@ -269,6 +269,7 @@ struct State4 :  TimedState<State4, MyStateMachine2>
 		runTimer(time1, 5000, new Ev2());
 		printf("%s\n", __FUNCTION__);
 	}
+	~State4() {printf("%s\n", __FUNCTION__);}
 	typedef sc::transition< Ev2, State3 > reactions;
 };
 
diff --git a/src/boostFSM/timedFSM.h b/src/boostFSM/timedFSM.h
index ca0415f5..64d37236 100644
--- a/src/boostFSM/timedFSM.h
+++ b/src/boostFSM/timedFSM.h
@@ -2,6 +2,7 @@
 #include "timerlist.h"
 #include <boost/statechart/event_base.hpp>
 #include <boost/statechart/state.hpp>
+#include <iostream>
 
 
 namespace sc = boost::statechart;
@@ -19,7 +20,7 @@ protected:
 public:
 	std::list<Timer *> active_timers;
 	TimedState(typename base_type::my_context ctx ) : base_type( ctx ) {
-		std::cout<<typeid(MostDerived).name()<<" global"<<std::endl;
+//		std::cout<<typeid(MostDerived).name()<<" global"<<std::endl;
 	}
 	~TimedState(){
 		if(global_timer_list.size()>0 && active_timers.size()>0)
@@ -37,7 +38,6 @@ public:
 		base_type::outermost_context().my_handle()->timer_list_.addTimer(t, milisec, e);
 		active_timers.push_back(&t);
 	}
-	// TODO Compiletime check - timed state jen v automatu s nasim schedulerem
 };
 
 template< class MostDerived,
@@ -52,7 +52,7 @@ protected:
 public:
 	std::list<Timer *> active_timers;
 	TimedSimpleState() {
-		std::cout<<typeid(MostDerived).name()<<" global"<<std::endl;
+//		std::cout<<typeid(MostDerived).name()<<" global"<<std::endl;
 	}
 	~TimedSimpleState(){
 		if(global_timer_list.size()>0 && active_timers.size()>0)
@@ -70,5 +70,4 @@ public:
 		base_type::outermost_context().my_handle()->timer_list_.addTimer(t, milisec, e);
 		active_timers.push_back(&t);
 	}
-	// TODO Compiletime check - timed state jen v automatu s nasim schedulerem
 };
-- 
2.39.2