Subject: [Boost-commit] svn:boost r62587 - in trunk/libs/msm/doc: HTML/examples HTML/examples/distributed_table HTML/examples/iPod_distributed PDF/examples PDF/examples/distributed_table PDF/examples/iPod_distributed
From: christophe.j.henry_at_[hidden]
Date: 2010-06-08 13:22:32
Author: chenry
Date: 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
New Revision: 62587
URL: http://svn.boost.org/trac/boost/changeset/62587
Log:
corrected inspection report warnings
Text files modified:
trunk/libs/msm/doc/HTML/examples/AnonymousTutorial.cpp | 6 +++---
trunk/libs/msm/doc/HTML/examples/AnonymousTutorialWithFunctors.cpp | 8 ++++----
trunk/libs/msm/doc/HTML/examples/BoostCon09Full.cpp | 28 ++++++++++++++--------------
trunk/libs/msm/doc/HTML/examples/CompositeTutorial.cpp | 14 +++++++-------
trunk/libs/msm/doc/HTML/examples/DirectEntryTutorial.cpp | 2 +-
trunk/libs/msm/doc/HTML/examples/Flags.cpp | 24 ++++++++++++------------
trunk/libs/msm/doc/HTML/examples/History.cpp | 14 +++++++-------
trunk/libs/msm/doc/HTML/examples/MsmComposite.cpp | 10 +++++-----
trunk/libs/msm/doc/HTML/examples/MsmSimple.cpp | 8 ++++----
trunk/libs/msm/doc/HTML/examples/MsmSimpleFunctors.cpp | 6 +++---
trunk/libs/msm/doc/HTML/examples/Orthogonal-deferred.cpp | 24 ++++++++++++------------
trunk/libs/msm/doc/HTML/examples/Orthogonal-deferred2.cpp | 24 ++++++++++++------------
trunk/libs/msm/doc/HTML/examples/ParsingDigits.cpp | 2 +-
trunk/libs/msm/doc/HTML/examples/SC | 2 +-
trunk/libs/msm/doc/HTML/examples/SC | 2 +-
trunk/libs/msm/doc/HTML/examples/SM-2Arg.cpp | 36 ++++++++++++++++++------------------
trunk/libs/msm/doc/HTML/examples/SimpleTutorial.cpp | 8 ++++----
trunk/libs/msm/doc/HTML/examples/SimpleTutorial2.cpp | 6 +++---
trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternal.cpp | 8 ++++----
trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternal2.cpp | 10 +++++-----
trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternalFunctors.cpp | 8 ++++----
trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors.cpp | 6 +++---
trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors2.cpp | 2 +-
trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors3.cpp | 2 +-
trunk/libs/msm/doc/HTML/examples/TestInternal.cpp | 18 +++++++++---------
trunk/libs/msm/doc/HTML/examples/char_event_dispatcher.hpp | 2 +-
trunk/libs/msm/doc/HTML/examples/distributed_table/Empty.hpp | 4 ++--
trunk/libs/msm/doc/HTML/examples/distributed_table/Events.hpp | 2 +-
trunk/libs/msm/doc/HTML/examples/distributed_table/Open.hpp | 6 +++---
trunk/libs/msm/doc/HTML/examples/iPodSearch.cpp | 2 +-
trunk/libs/msm/doc/HTML/examples/iPod_distributed/MenuMode.hpp | 4 ++--
trunk/libs/msm/doc/HTML/examples/iPod_distributed/PlayingMode.hpp | 6 +++---
trunk/libs/msm/doc/HTML/examples/iPod_distributed/iPod.cpp | 2 +-
trunk/libs/msm/doc/PDF/examples/AnonymousTutorial.cpp | 6 +++---
trunk/libs/msm/doc/PDF/examples/AnonymousTutorialWithFunctors.cpp | 8 ++++----
trunk/libs/msm/doc/PDF/examples/BoostCon09Full.cpp | 28 ++++++++++++++--------------
trunk/libs/msm/doc/PDF/examples/CompositeTutorial.cpp | 14 +++++++-------
trunk/libs/msm/doc/PDF/examples/DirectEntryTutorial.cpp | 2 +-
trunk/libs/msm/doc/PDF/examples/Flags.cpp | 24 ++++++++++++------------
trunk/libs/msm/doc/PDF/examples/History.cpp | 14 +++++++-------
trunk/libs/msm/doc/PDF/examples/MsmComposite.cpp | 10 +++++-----
trunk/libs/msm/doc/PDF/examples/MsmSimple.cpp | 8 ++++----
trunk/libs/msm/doc/PDF/examples/MsmSimpleFunctors.cpp | 6 +++---
trunk/libs/msm/doc/PDF/examples/Orthogonal-deferred.cpp | 24 ++++++++++++------------
trunk/libs/msm/doc/PDF/examples/Orthogonal-deferred2.cpp | 24 ++++++++++++------------
trunk/libs/msm/doc/PDF/examples/ParsingDigits.cpp | 2 +-
trunk/libs/msm/doc/PDF/examples/SC | 2 +-
trunk/libs/msm/doc/PDF/examples/SC | 2 +-
trunk/libs/msm/doc/PDF/examples/SM-2Arg.cpp | 36 ++++++++++++++++++------------------
trunk/libs/msm/doc/PDF/examples/SimpleTutorial.cpp | 8 ++++----
trunk/libs/msm/doc/PDF/examples/SimpleTutorial2.cpp | 6 +++---
trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternal.cpp | 8 ++++----
trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternal2.cpp | 10 +++++-----
trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternalFunctors.cpp | 8 ++++----
trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors.cpp | 6 +++---
trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors2.cpp | 2 +-
trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors3.cpp | 2 +-
trunk/libs/msm/doc/PDF/examples/TestInternal.cpp | 18 +++++++++---------
trunk/libs/msm/doc/PDF/examples/char_event_dispatcher.hpp | 2 +-
trunk/libs/msm/doc/PDF/examples/distributed_table/Empty.hpp | 4 ++--
trunk/libs/msm/doc/PDF/examples/distributed_table/Events.hpp | 2 +-
trunk/libs/msm/doc/PDF/examples/distributed_table/Open.hpp | 6 +++---
trunk/libs/msm/doc/PDF/examples/iPodSearch.cpp | 2 +-
trunk/libs/msm/doc/PDF/examples/iPod_distributed/MenuMode.hpp | 4 ++--
trunk/libs/msm/doc/PDF/examples/iPod_distributed/PlayingMode.hpp | 6 +++---
trunk/libs/msm/doc/PDF/examples/iPod_distributed/iPod.cpp | 2 +-
66 files changed, 306 insertions(+), 306 deletions(-)
Modified: trunk/libs/msm/doc/HTML/examples/AnonymousTutorial.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/AnonymousTutorial.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/AnonymousTutorial.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -37,7 +37,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: State1" << std::endl;}
};
struct State2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: State2" << std::endl;}
template <class Event,class FSM>
@@ -45,7 +45,7 @@
};
struct State3 : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: State3" << std::endl;}
@@ -83,7 +83,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
_row < State1 , none , State2 >,
a_row < State2 , none , State3 , &p::State2ToState3 >,
Modified: trunk/libs/msm/doc/HTML/examples/AnonymousTutorialWithFunctors.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/AnonymousTutorialWithFunctors.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/AnonymousTutorialWithFunctors.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -40,7 +40,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: State1" << std::endl;}
};
struct State2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: State2" << std::endl;}
template <class Event,class FSM>
@@ -48,7 +48,7 @@
};
struct State3 : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: State3" << std::endl;}
@@ -108,7 +108,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
Row < State1 , none , State2 >,
Row < State2 , none , State3 , State2ToState3 >,
@@ -140,7 +140,7 @@
void test()
{
- my_machine p;
+ my_machine p;
// needed to start the highest-level SM. This will call on_entry and mark the start of the SM
// in this case it will also immediately trigger all anonymous transitions
Modified: trunk/libs/msm/doc/HTML/examples/BoostCon09Full.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/BoostCon09Full.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/BoostCon09Full.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -67,9 +67,9 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
- typedef mpl::vector1<CDLoaded> flag_list;
- typedef mpl::vector<play> deferred_events;
+ {
+ typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector<play> deferred_events;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -79,9 +79,9 @@
// and using for this the non-default policy
// if policy used, set_sm_ptr is needed
struct Stopped : public msm::front::state<default_base_state,msm::front::sm_ptr>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -97,7 +97,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_>
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector<CDLoaded> flag_list;
+ typedef mpl::vector<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
template <class Event,class FSM>
@@ -106,21 +106,21 @@
// The list of FSM states
struct Song1 : public msm::front::state<>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: First Song" << std::endl;}
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -144,7 +144,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+---------------+------------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -166,7 +166,7 @@
// the player state machine contains a state which is himself a state machine (2 of them, Playing and Paused)
struct Paused : public msm::front::state<>
{
- typedef mpl::vector<CDLoaded> flag_list;
+ typedef mpl::vector<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Paused" << std::endl;}
template <class Event,class FSM>
@@ -207,7 +207,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
void report_error(error_found const&) {std::cout << "player::report_error\n";}
void report_end_error(end_error const&) {std::cout << "player::report_end_error\n";}
// guard conditions
@@ -226,7 +226,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +-------------+---------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
@@ -269,7 +269,7 @@
void pstate(player const& p)
{
- typedef player::stt Stt;
+ typedef player::stt Stt;
typedef msm::back::generate_state_set<Stt>::type all_states;
static char const* state_names[mpl::size<all_states>::value];
// fill the names of the states defined in the state machine
Modified: trunk/libs/msm/doc/HTML/examples/CompositeTutorial.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/CompositeTutorial.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/CompositeTutorial.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -51,7 +51,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -59,7 +59,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
@@ -88,14 +88,14 @@
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -111,7 +111,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -148,14 +148,14 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/DirectEntryTutorial.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/DirectEntryTutorial.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/DirectEntryTutorial.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -130,7 +130,7 @@
// Transition table for SubFsm2
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +--------------+-------------+------------+------------------------+----------------------+
a_row < PseudoEntry1 , event4 , SubState3 ,&SubFsm2_::entry_action >,
_row < SubState2 , event6 , SubState1 >,
Modified: trunk/libs/msm/doc/HTML/examples/Flags.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/Flags.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/Flags.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -56,8 +56,8 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
- typedef mpl::vector1<CDLoaded> flag_list;
+ {
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -65,9 +65,9 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -80,7 +80,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_>
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
@@ -90,7 +90,7 @@
// The list of FSM states
struct Song1 : public msm::front::state<>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
@@ -98,14 +98,14 @@
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -121,7 +121,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -143,7 +143,7 @@
// state not defining any entry or exit
struct Paused : public msm::front::state<>
{
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
};
// the initial state of the player SM. Must be defined
@@ -158,14 +158,14 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/History.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/History.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/History.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -51,7 +51,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -59,7 +59,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
@@ -84,14 +84,14 @@
void on_exit(Event const&,FSM& ) {std::cout << "finishing: First Song" << std::endl;}
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -107,7 +107,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -152,14 +152,14 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/MsmComposite.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/MsmComposite.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/MsmComposite.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -51,7 +51,7 @@
void on_exit(Event const&,FSM& ) {/*std::cout << "leaving: Empty" << std::endl;*/}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Open" << std::endl;*/}
template <class Event,class FSM>
@@ -59,7 +59,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Stopped" << std::endl;*/}
@@ -87,7 +87,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -126,14 +126,14 @@
void pause_playback(pause const&) { }
void resume_playback(end_pause const&) { }
void stop_and_open(open_close const&) { }
- void stopped_again(stop const&) {}
+ void stopped_again(stop const&){}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/MsmSimple.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/MsmSimple.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/MsmSimple.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -48,7 +48,7 @@
void on_exit(Event const&,FSM& ) {/*std::cout << "leaving: Empty" << std::endl;*/}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Open" << std::endl;*/}
template <class Event,class FSM>
@@ -56,7 +56,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Stopped" << std::endl;*/}
template <class Event,class FSM>
@@ -90,14 +90,14 @@
void pause_playback(pause const&) { }
void resume_playback(end_pause const&) { }
void stop_and_open(open_close const&) { }
- void stopped_again(stop const&) {}
+ void stopped_again(stop const&){}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
_row < Stopped , play , Playing >,
_row < Stopped , open_close , Open >,
Modified: trunk/libs/msm/doc/HTML/examples/MsmSimpleFunctors.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/MsmSimpleFunctors.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/MsmSimpleFunctors.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -50,7 +50,7 @@
void on_exit(Event const&,FSM& ) {/*std::cout << "leaving: Empty" << std::endl;*/}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Open" << std::endl;*/}
template <class Event,class FSM>
@@ -58,7 +58,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Stopped" << std::endl;*/}
@@ -153,7 +153,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
Row < Stopped , play , Playing , start_playback >,
Row < Stopped , open_close , Open , open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/Orthogonal-deferred.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/Orthogonal-deferred.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/Orthogonal-deferred.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -61,11 +61,11 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
// if the play event arrives in this state, defer it until a state handles it or
// rejects it
typedef mpl::vector<play> deferred_events;
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -73,9 +73,9 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -88,7 +88,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_>
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
@@ -97,21 +97,21 @@
// The list of FSM states
struct Song1 : public msm::front::state<>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: First Song" << std::endl;}
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -127,7 +127,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -149,7 +149,7 @@
// state not defining any entry or exit
struct Paused : public msm::front::state<>
{
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
};
struct AllOk : public msm::front::state<>
{
@@ -180,7 +180,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
void report_error(error_found const&) {std::cout << "player::report_error\n";}
void report_end_error(end_error const&) {std::cout << "player::report_end_error\n";}
@@ -190,7 +190,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/Orthogonal-deferred2.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/Orthogonal-deferred2.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/Orthogonal-deferred2.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -63,8 +63,8 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
- typedef mpl::vector1<CDLoaded> flag_list;
+ {
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -72,9 +72,9 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -87,7 +87,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_>
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
@@ -96,21 +96,21 @@
// The list of FSM states
struct Song1 : public msm::front::state<>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: First Song" << std::endl;}
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -126,7 +126,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -148,7 +148,7 @@
// state not defining any entry or exit
struct Paused : public msm::front::state<>
{
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
};
struct AllOk : public msm::front::state<>
{
@@ -179,7 +179,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
void report_error(error_found const&) {std::cout << "player::report_error\n";}
void report_end_error(end_error const&) {std::cout << "player::report_end_error\n";}
@@ -189,7 +189,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/ParsingDigits.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/ParsingDigits.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/ParsingDigits.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -216,7 +216,7 @@
// Transition table for parsing_
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +-------------+-------------------+---------+---------------------+----------------------+
Row < Waiting , digit , Digit1 >,
Row < Digit1 , digit , Digit2 >,
Modified: trunk/libs/msm/doc/HTML/examples/SC Composite.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SC Composite.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SC Composite.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -51,7 +51,7 @@
void store_cd_info(cd_detected const& cd) {/*std::cout << "player::store_cd_info\n";*/ }
void close_drawer(open_close const&) { /*std::cout << "player::close_drawer\n";*/ }
void start_playback(play const&) { /*std::cout << "player::start_playback\n";*/ }
- void stopped_again(stop const&) {/*std::cout << "player::stopped_again\n";*/}
+ void stopped_again(stop const&) {/*std::cout << "player::stopped_again\n";*/}
void stop_playback(stop const&) { /*std::cout << "player::stop_playback\n";*/ }
void pause_playback(pause const&) { /*std::cout << "player::pause_playback\n"; */}
void stop_and_open(open_close const&) { /*std::cout << "player::stop_and_open\n";*/ }
Modified: trunk/libs/msm/doc/HTML/examples/SC Simple.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SC Simple.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SC Simple.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -50,7 +50,7 @@
void store_cd_info(cd_detected const& cd) {/*std::cout << "player::store_cd_info\n";*/ }
void close_drawer(open_close const&) { /*std::cout << "player::close_drawer\n";*/ }
void start_playback(play const&) { /*std::cout << "player::start_playback\n";*/ }
- void stopped_again(stop const&) {/*std::cout << "player::stopped_again\n";*/}
+ void stopped_again(stop const&) {/*std::cout << "player::stopped_again\n";*/}
void stop_playback(stop const&) { /*std::cout << "player::stop_playback\n";*/ }
void pause_playback(pause const&) { /*std::cout << "player::pause_playback\n"; */}
void stop_and_open(open_close const&) { /*std::cout << "player::stop_and_open\n";*/ }
Modified: trunk/libs/msm/doc/HTML/examples/SM-2Arg.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SM-2Arg.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SM-2Arg.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -91,8 +91,8 @@
}
};
struct Open : public msm::front::state<my_visitable_state>
- {
- typedef mpl::vector1<CDLoaded> flag_list;
+ {
+ typedef mpl::vector1<CDLoaded> flag_list;
typedef mpl::vector<play> deferred_events;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
@@ -107,9 +107,9 @@
// and using for this the non-default policy
// if policy used, set_sm_ptr is needed
struct Stopped : public msm::front::state<my_visitable_state>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -123,7 +123,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_,my_visitable_state >
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
template <class Event,class FSM>
@@ -138,7 +138,7 @@
// so we have a SM containing a SM containing a SM
struct Song1_ : public msm::front::state_machine_def<Song1_,my_visitable_state>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
@@ -148,14 +148,14 @@
vis.visit_state(this,i);
}
struct LightOn : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: LightOn" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: LightOn" << std::endl;}
};
struct LightOff : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: LightOff" << std::endl;}
template <class Event,class FSM>
@@ -170,7 +170,7 @@
typedef Song1_ s; // makes transition table cleaner
// Transition table for Song1
struct transition_table : mpl::vector1<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < LightOn , ThreeSec , LightOff, &s::turn_light_off >
// +---------+-------------+---------+---------------------+----------------------+
@@ -186,14 +186,14 @@
typedef msm::back::state_machine<Song1_> Song1;
struct Song2 : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -209,7 +209,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -230,7 +230,7 @@
// the player state machine contains a state which is himself a state machine (2 of them, Playing and Paused)
struct Paused_ : public msm::front::state_machine_def<Paused_,my_visitable_state>
{
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Paused" << std::endl;}
template <class Event,class FSM>
@@ -238,14 +238,14 @@
// The list of FSM states
struct StartBlinking : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: StartBlinking" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: StartBlinking" << std::endl;}
};
struct StopBlinking : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: StopBlinking" << std::endl;}
template <class Event,class FSM>
@@ -261,7 +261,7 @@
typedef Paused_ pa; // makes transition table cleaner
// Transition table
struct transition_table : mpl::vector2<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------------+-------------+--------------+---------------------+----------------------+
a_row < StartBlinking , TenSec , StopBlinking , &pa::stop_blinking >,
a_row < StopBlinking , TenSec , StartBlinking , &pa::start_blinking >
@@ -315,7 +315,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
void start_sleep(go_sleep const&) { }
void report_error(error_found const&) {std::cout << "player::report_error\n";}
void report_end_error(end_error const&) {std::cout << "player::report_end_error\n";}
@@ -326,7 +326,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/SimpleTutorial.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SimpleTutorial.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SimpleTutorial.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -56,7 +56,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -65,7 +65,7 @@
// sm_ptr still supported but deprecated as functors are a much better way to do the same thing
struct Stopped : public msm::front::state<msm::front::default_base_state,msm::front::sm_ptr>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -102,7 +102,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
// guard conditions
bool good_disk_format(cd_detected const& evt)
{
@@ -125,7 +125,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/SimpleTutorial2.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SimpleTutorial2.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SimpleTutorial2.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -66,7 +66,7 @@
}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -77,7 +77,7 @@
// sm_ptr still supported but deprecated as functors are a much better way to do the same thing
struct Stopped : public msm::front::state<msm::front::default_base_state,msm::front::sm_ptr>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -132,7 +132,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action/Guard
+ // Start Event Next Action/Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row2 < Stopped , play , Playing , Stopped , &Stopped::start_playback >,
a_row2 < Stopped , open_close , Open , Empty , &Empty::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternal.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternal.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternal.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -59,7 +59,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -68,7 +68,7 @@
// sm_ptr still supported but deprecated as functors are a much better way to do the same thing
struct Stopped : public msm::front::state<msm::front::default_base_state,msm::front::sm_ptr>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -105,7 +105,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
// guard conditions
bool good_disk_format(cd_detected const& evt)
{
@@ -146,7 +146,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternal2.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternal2.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternal2.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -83,13 +83,13 @@
// Transition table for Empty
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Internal < cd_detected , internal_action_fct ,internal_guard_fct >
// +---------+-------------+---------+---------------------+----------------------+
> {};
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -98,7 +98,7 @@
// sm_ptr still supported but deprecated as functors are a much better way to do the same thing
struct Stopped : public msm::front::state<msm::front::default_base_state,msm::front::sm_ptr>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -135,7 +135,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
// guard conditions
bool good_disk_format(cd_detected const& evt)
{
@@ -152,7 +152,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternalFunctors.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternalFunctors.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SimpleTutorialInternalFunctors.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -81,13 +81,13 @@
};
// Transition table for Empty
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Internal < cd_detected , internal_action_fct ,internal_guard_fct >
// +---------+-------------+---------+---------------------+----------------------+
> {};
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -95,7 +95,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -244,7 +244,7 @@
};
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------------+----------------------+
Row < Stopped , play , Playing , ActionSequence_
<mpl::vector<
Modified: trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -66,7 +66,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -74,7 +74,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
@@ -223,7 +223,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------------+----------------------+
Row < Stopped , play , Playing , ActionSequence_
<mpl::vector<
Modified: trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors2.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors2.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors2.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -239,7 +239,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------------+----------------------+
Row < Stopped , play , Playing , ActionSequence_
<mpl::vector<
Modified: trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors3.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors3.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/SimpleWithFunctors3.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -229,7 +229,7 @@
// Transition table for player
struct player_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------------+----------------------+
Row < Stopped , play , Playing , ActionSequence_
<mpl::vector<
Modified: trunk/libs/msm/doc/HTML/examples/TestInternal.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/TestInternal.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/TestInternal.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -64,7 +64,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
// guard conditions
bool good_disk_format(cd_detected const& evt)
{
@@ -119,7 +119,7 @@
void internal_action(to_ignore const&) { std::cout << "Empty::(almost)ignoring event\n"; }
// Transition table for Empty
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Row < Empty , cd_detected , none , internal_action_fct ,internal_guard_fct >,
Internal < cd_detected , internal_action_fct ,internal_guard_fct >,
a_internal< to_ignore , Empty,&Empty::internal_action >
@@ -127,7 +127,7 @@
> {};
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -135,7 +135,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -160,14 +160,14 @@
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -208,7 +208,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+---------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong , Song1 , &pl::start_prev_song >,
@@ -220,7 +220,7 @@
// +---------+----------------+---------+---------------------+-----------------------+
struct internal_transition_table : mpl::vector<
// normal internal transition
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Internal < internal_event , playing_internal_fct,playing_internal_guard >,
// conflict between internal and the external defined above
Internal < PreviousSong , playing_internal_fct,playing_false_guard >,
@@ -252,7 +252,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/HTML/examples/char_event_dispatcher.hpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/char_event_dispatcher.hpp (original)
+++ trunk/libs/msm/doc/HTML/examples/char_event_dispatcher.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -89,4 +89,4 @@
};
}}} // boost::msm::back
-#endif //BOOST_MSM_CHAR_EVENT_DISPATCHER_HPP
\ No newline at end of file
+#endif //BOOST_MSM_CHAR_EVENT_DISPATCHER_HPP
Modified: trunk/libs/msm/doc/HTML/examples/distributed_table/Empty.hpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/distributed_table/Empty.hpp (original)
+++ trunk/libs/msm/doc/HTML/examples/distributed_table/Empty.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -33,11 +33,11 @@
void open_drawer(open_close const&);
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
//+-------------+---------+-------------+---------+---------------------------+----------------------+
msm::front::a_row2 < Empty , open_close , Open , Empty,&Empty::open_drawer >
//+-------------+---------+-------------+---------+---------------------------+----------------------+
> {};
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/libs/msm/doc/HTML/examples/distributed_table/Events.hpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/distributed_table/Events.hpp (original)
+++ trunk/libs/msm/doc/HTML/examples/distributed_table/Events.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -36,4 +36,4 @@
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/libs/msm/doc/HTML/examples/distributed_table/Open.hpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/distributed_table/Open.hpp (original)
+++ trunk/libs/msm/doc/HTML/examples/distributed_table/Open.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -26,7 +26,7 @@
using namespace msm::front;
struct Open : public msm::front::state<>
-{
+{
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -34,11 +34,11 @@
void close_drawer(open_close const&);
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
//+-------------+---------+-------------+---------+---------------------------+----------------------+
msm::front::a_row2 < Open , open_close , Empty , Open,&Open::close_drawer >
//+-------------+---------+-------------+---------+---------------------------+----------------------+
> {};
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/libs/msm/doc/HTML/examples/iPodSearch.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/iPodSearch.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/iPodSearch.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -133,7 +133,7 @@
// Transition table for player
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +-----------+------------------+------------+---------------------+----------------------+
_row < MyForeach , OneSong , MyFind >,
_row < MyFind , NotFound<string> , MyForeach >,
Modified: trunk/libs/msm/doc/HTML/examples/iPod_distributed/MenuMode.hpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/iPod_distributed/MenuMode.hpp (original)
+++ trunk/libs/msm/doc/HTML/examples/iPod_distributed/MenuMode.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -24,7 +24,7 @@
struct MenuMode_ : public msm::front::state_machine_def<MenuMode_>
{
- typedef mpl::vector1<MenuActive> flag_list;
+ typedef mpl::vector1<MenuActive> flag_list;
struct WaitingForSongChoice : public msm::front::state<>
{
template <class Event,class FSM>
@@ -50,7 +50,7 @@
typedef MenuMode_ fsm; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector2<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------------------+------------------+-------------------+---------------------+----------------------+
_row < WaitingForSongChoice , MenuMiddleButton , StartCurrentSong >,
_row < StartCurrentSong , SelectSong , MenuExit >
Modified: trunk/libs/msm/doc/HTML/examples/iPod_distributed/PlayingMode.hpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/iPod_distributed/PlayingMode.hpp (original)
+++ trunk/libs/msm/doc/HTML/examples/iPod_distributed/PlayingMode.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -110,7 +110,7 @@
};
struct SetPosition : public msm::front::state<>
{
- typedef mpl::vector1<NoFastFwd> flag_list;
+ typedef mpl::vector1<NoFastFwd> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: PlayingMode::SetPosition" << std::endl;}
template <class Event,class FSM>
@@ -209,7 +209,7 @@
typedef PlayingMode_ fsm; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector19<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +--------------------+---------------------+--------------------+--------------------------+----------------------+
_row < Playing , PlayPause , Paused >,
_row < Playing , Off , Paused >,
@@ -223,7 +223,7 @@
// +--------------------+---------------------+--------------------+--------------------------+----------------------+
_row < WaitingForEnd , EndPlay , PlayingExit >,
// +--------------------+---------------------+--------------------+--------------------------+----------------------+
- msm::front::Row < NoForward , EastPressed , ForwardPressed , msm::front::none , fast_fwd_ok >,
+ msm::front::Row < NoForward , EastPressed , ForwardPressed , msm::front::none , fast_fwd_ok >,
msm::front::Row < ForwardPressed , EastReleased , NoForward , send_NextSong , msm::front::none >,
a_row < ForwardPressed , ForwardTimer , FastForward , &fsm::do_fast_forward >,
a_row < FastForward , ForwardTimer , FastForward , &fsm::do_fast_forward >,
Modified: trunk/libs/msm/doc/HTML/examples/iPod_distributed/iPod.cpp
==============================================================================
--- trunk/libs/msm/doc/HTML/examples/iPod_distributed/iPod.cpp (original)
+++ trunk/libs/msm/doc/HTML/examples/iPod_distributed/iPod.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -144,7 +144,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +-------------------+---------------+-------------------+--------------------------------+----------------------+
_row < NotHolding , Hold , Holding >,
_row < Holding , NoHold , NotHolding >,
Modified: trunk/libs/msm/doc/PDF/examples/AnonymousTutorial.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/AnonymousTutorial.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/AnonymousTutorial.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -37,7 +37,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: State1" << std::endl;}
};
struct State2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: State2" << std::endl;}
template <class Event,class FSM>
@@ -45,7 +45,7 @@
};
struct State3 : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: State3" << std::endl;}
@@ -83,7 +83,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
_row < State1 , none , State2 >,
a_row < State2 , none , State3 , &p::State2ToState3 >,
Modified: trunk/libs/msm/doc/PDF/examples/AnonymousTutorialWithFunctors.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/AnonymousTutorialWithFunctors.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/AnonymousTutorialWithFunctors.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -40,7 +40,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: State1" << std::endl;}
};
struct State2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: State2" << std::endl;}
template <class Event,class FSM>
@@ -48,7 +48,7 @@
};
struct State3 : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: State3" << std::endl;}
@@ -108,7 +108,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
Row < State1 , none , State2 >,
Row < State2 , none , State3 , State2ToState3 >,
@@ -140,7 +140,7 @@
void test()
{
- my_machine p;
+ my_machine p;
// needed to start the highest-level SM. This will call on_entry and mark the start of the SM
// in this case it will also immediately trigger all anonymous transitions
Modified: trunk/libs/msm/doc/PDF/examples/BoostCon09Full.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/BoostCon09Full.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/BoostCon09Full.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -67,9 +67,9 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
- typedef mpl::vector1<CDLoaded> flag_list;
- typedef mpl::vector<play> deferred_events;
+ {
+ typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector<play> deferred_events;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -79,9 +79,9 @@
// and using for this the non-default policy
// if policy used, set_sm_ptr is needed
struct Stopped : public msm::front::state<default_base_state,msm::front::sm_ptr>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -97,7 +97,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_>
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector<CDLoaded> flag_list;
+ typedef mpl::vector<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
template <class Event,class FSM>
@@ -106,21 +106,21 @@
// The list of FSM states
struct Song1 : public msm::front::state<>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: First Song" << std::endl;}
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -144,7 +144,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+---------------+------------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -166,7 +166,7 @@
// the player state machine contains a state which is himself a state machine (2 of them, Playing and Paused)
struct Paused : public msm::front::state<>
{
- typedef mpl::vector<CDLoaded> flag_list;
+ typedef mpl::vector<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Paused" << std::endl;}
template <class Event,class FSM>
@@ -207,7 +207,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
void report_error(error_found const&) {std::cout << "player::report_error\n";}
void report_end_error(end_error const&) {std::cout << "player::report_end_error\n";}
// guard conditions
@@ -226,7 +226,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +-------------+---------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
@@ -269,7 +269,7 @@
void pstate(player const& p)
{
- typedef player::stt Stt;
+ typedef player::stt Stt;
typedef msm::back::generate_state_set<Stt>::type all_states;
static char const* state_names[mpl::size<all_states>::value];
// fill the names of the states defined in the state machine
Modified: trunk/libs/msm/doc/PDF/examples/CompositeTutorial.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/CompositeTutorial.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/CompositeTutorial.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -51,7 +51,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -59,7 +59,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
@@ -88,14 +88,14 @@
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -111,7 +111,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -148,14 +148,14 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/DirectEntryTutorial.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/DirectEntryTutorial.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/DirectEntryTutorial.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -130,7 +130,7 @@
// Transition table for SubFsm2
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +--------------+-------------+------------+------------------------+----------------------+
a_row < PseudoEntry1 , event4 , SubState3 ,&SubFsm2_::entry_action >,
_row < SubState2 , event6 , SubState1 >,
Modified: trunk/libs/msm/doc/PDF/examples/Flags.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/Flags.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/Flags.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -56,8 +56,8 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
- typedef mpl::vector1<CDLoaded> flag_list;
+ {
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -65,9 +65,9 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -80,7 +80,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_>
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
@@ -90,7 +90,7 @@
// The list of FSM states
struct Song1 : public msm::front::state<>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
@@ -98,14 +98,14 @@
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -121,7 +121,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -143,7 +143,7 @@
// state not defining any entry or exit
struct Paused : public msm::front::state<>
{
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
};
// the initial state of the player SM. Must be defined
@@ -158,14 +158,14 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/History.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/History.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/History.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -51,7 +51,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -59,7 +59,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
@@ -84,14 +84,14 @@
void on_exit(Event const&,FSM& ) {std::cout << "finishing: First Song" << std::endl;}
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -107,7 +107,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -152,14 +152,14 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/MsmComposite.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/MsmComposite.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/MsmComposite.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -51,7 +51,7 @@
void on_exit(Event const&,FSM& ) {/*std::cout << "leaving: Empty" << std::endl;*/}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Open" << std::endl;*/}
template <class Event,class FSM>
@@ -59,7 +59,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Stopped" << std::endl;*/}
@@ -87,7 +87,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -126,14 +126,14 @@
void pause_playback(pause const&) { }
void resume_playback(end_pause const&) { }
void stop_and_open(open_close const&) { }
- void stopped_again(stop const&) {}
+ void stopped_again(stop const&){}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/MsmSimple.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/MsmSimple.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/MsmSimple.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -48,7 +48,7 @@
void on_exit(Event const&,FSM& ) {/*std::cout << "leaving: Empty" << std::endl;*/}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Open" << std::endl;*/}
template <class Event,class FSM>
@@ -56,7 +56,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Stopped" << std::endl;*/}
template <class Event,class FSM>
@@ -90,14 +90,14 @@
void pause_playback(pause const&) { }
void resume_playback(end_pause const&) { }
void stop_and_open(open_close const&) { }
- void stopped_again(stop const&) {}
+ void stopped_again(stop const&){}
// guard conditions
typedef player_ p; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
_row < Stopped , play , Playing >,
_row < Stopped , open_close , Open >,
Modified: trunk/libs/msm/doc/PDF/examples/MsmSimpleFunctors.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/MsmSimpleFunctors.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/MsmSimpleFunctors.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -50,7 +50,7 @@
void on_exit(Event const&,FSM& ) {/*std::cout << "leaving: Empty" << std::endl;*/}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Open" << std::endl;*/}
template <class Event,class FSM>
@@ -58,7 +58,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {/*std::cout << "entering: Stopped" << std::endl;*/}
@@ -153,7 +153,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
Row < Stopped , play , Playing , start_playback >,
Row < Stopped , open_close , Open , open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/Orthogonal-deferred.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/Orthogonal-deferred.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/Orthogonal-deferred.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -61,11 +61,11 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
// if the play event arrives in this state, defer it until a state handles it or
// rejects it
typedef mpl::vector<play> deferred_events;
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -73,9 +73,9 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -88,7 +88,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_>
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
@@ -97,21 +97,21 @@
// The list of FSM states
struct Song1 : public msm::front::state<>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: First Song" << std::endl;}
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -127,7 +127,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -149,7 +149,7 @@
// state not defining any entry or exit
struct Paused : public msm::front::state<>
{
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
};
struct AllOk : public msm::front::state<>
{
@@ -180,7 +180,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
void report_error(error_found const&) {std::cout << "player::report_error\n";}
void report_end_error(end_error const&) {std::cout << "player::report_end_error\n";}
@@ -190,7 +190,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/Orthogonal-deferred2.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/Orthogonal-deferred2.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/Orthogonal-deferred2.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -63,8 +63,8 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
- typedef mpl::vector1<CDLoaded> flag_list;
+ {
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -72,9 +72,9 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -87,7 +87,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_>
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
@@ -96,21 +96,21 @@
// The list of FSM states
struct Song1 : public msm::front::state<>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: First Song" << std::endl;}
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -126,7 +126,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -148,7 +148,7 @@
// state not defining any entry or exit
struct Paused : public msm::front::state<>
{
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
};
struct AllOk : public msm::front::state<>
{
@@ -179,7 +179,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
void report_error(error_found const&) {std::cout << "player::report_error\n";}
void report_end_error(end_error const&) {std::cout << "player::report_end_error\n";}
@@ -189,7 +189,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/ParsingDigits.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/ParsingDigits.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/ParsingDigits.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -216,7 +216,7 @@
// Transition table for parsing_
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +-------------+-------------------+---------+---------------------+----------------------+
Row < Waiting , digit , Digit1 >,
Row < Digit1 , digit , Digit2 >,
Modified: trunk/libs/msm/doc/PDF/examples/SC Composite.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SC Composite.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SC Composite.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -51,7 +51,7 @@
void store_cd_info(cd_detected const& cd) {/*std::cout << "player::store_cd_info\n";*/ }
void close_drawer(open_close const&) { /*std::cout << "player::close_drawer\n";*/ }
void start_playback(play const&) { /*std::cout << "player::start_playback\n";*/ }
- void stopped_again(stop const&) {/*std::cout << "player::stopped_again\n";*/}
+ void stopped_again(stop const&) {/*std::cout << "player::stopped_again\n";*/}
void stop_playback(stop const&) { /*std::cout << "player::stop_playback\n";*/ }
void pause_playback(pause const&) { /*std::cout << "player::pause_playback\n"; */}
void stop_and_open(open_close const&) { /*std::cout << "player::stop_and_open\n";*/ }
Modified: trunk/libs/msm/doc/PDF/examples/SC Simple.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SC Simple.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SC Simple.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -50,7 +50,7 @@
void store_cd_info(cd_detected const& cd) {/*std::cout << "player::store_cd_info\n";*/ }
void close_drawer(open_close const&) { /*std::cout << "player::close_drawer\n";*/ }
void start_playback(play const&) { /*std::cout << "player::start_playback\n";*/ }
- void stopped_again(stop const&) {/*std::cout << "player::stopped_again\n";*/}
+ void stopped_again(stop const&) {/*std::cout << "player::stopped_again\n";*/}
void stop_playback(stop const&) { /*std::cout << "player::stop_playback\n";*/ }
void pause_playback(pause const&) { /*std::cout << "player::pause_playback\n"; */}
void stop_and_open(open_close const&) { /*std::cout << "player::stop_and_open\n";*/ }
Modified: trunk/libs/msm/doc/PDF/examples/SM-2Arg.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SM-2Arg.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SM-2Arg.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -91,8 +91,8 @@
}
};
struct Open : public msm::front::state<my_visitable_state>
- {
- typedef mpl::vector1<CDLoaded> flag_list;
+ {
+ typedef mpl::vector1<CDLoaded> flag_list;
typedef mpl::vector<play> deferred_events;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Open" << std::endl;}
@@ -107,9 +107,9 @@
// and using for this the non-default policy
// if policy used, set_sm_ptr is needed
struct Stopped : public msm::front::state<my_visitable_state>
- {
+ {
// when stopped, the CD is loaded
- typedef mpl::vector1<CDLoaded> flag_list;
+ typedef mpl::vector1<CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -123,7 +123,7 @@
struct Playing_ : public msm::front::state_machine_def<Playing_,my_visitable_state >
{
// when playing, the CD is loaded and we are in either pause or playing (duh)
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Playing" << std::endl;}
template <class Event,class FSM>
@@ -138,7 +138,7 @@
// so we have a SM containing a SM containing a SM
struct Song1_ : public msm::front::state_machine_def<Song1_,my_visitable_state>
{
- typedef mpl::vector1<FirstSongPlaying> flag_list;
+ typedef mpl::vector1<FirstSongPlaying> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: First song" << std::endl;}
template <class Event,class FSM>
@@ -148,14 +148,14 @@
vis.visit_state(this,i);
}
struct LightOn : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: LightOn" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: LightOn" << std::endl;}
};
struct LightOff : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: LightOff" << std::endl;}
template <class Event,class FSM>
@@ -170,7 +170,7 @@
typedef Song1_ s; // makes transition table cleaner
// Transition table for Song1
struct transition_table : mpl::vector1<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < LightOn , ThreeSec , LightOff, &s::turn_light_off >
// +---------+-------------+---------+---------------------+----------------------+
@@ -186,14 +186,14 @@
typedef msm::back::state_machine<Song1_> Song1;
struct Song2 : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -209,7 +209,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong, Song1 , &pl::start_prev_song >,
@@ -230,7 +230,7 @@
// the player state machine contains a state which is himself a state machine (2 of them, Playing and Paused)
struct Paused_ : public msm::front::state_machine_def<Paused_,my_visitable_state>
{
- typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
+ typedef mpl::vector2<PlayingPaused,CDLoaded> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "entering: Paused" << std::endl;}
template <class Event,class FSM>
@@ -238,14 +238,14 @@
// The list of FSM states
struct StartBlinking : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: StartBlinking" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: StartBlinking" << std::endl;}
};
struct StopBlinking : public msm::front::state<my_visitable_state>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: StopBlinking" << std::endl;}
template <class Event,class FSM>
@@ -261,7 +261,7 @@
typedef Paused_ pa; // makes transition table cleaner
// Transition table
struct transition_table : mpl::vector2<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------------+-------------+--------------+---------------------+----------------------+
a_row < StartBlinking , TenSec , StopBlinking , &pa::stop_blinking >,
a_row < StopBlinking , TenSec , StartBlinking , &pa::start_blinking >
@@ -315,7 +315,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
void start_sleep(go_sleep const&) { }
void report_error(error_found const&) {std::cout << "player::report_error\n";}
void report_end_error(end_error const&) {std::cout << "player::report_end_error\n";}
@@ -326,7 +326,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/SimpleTutorial.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SimpleTutorial.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SimpleTutorial.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -56,7 +56,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -65,7 +65,7 @@
// sm_ptr still supported but deprecated as functors are a much better way to do the same thing
struct Stopped : public msm::front::state<msm::front::default_base_state,msm::front::sm_ptr>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -102,7 +102,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&){std::cout << "player::stopped_again\n";}
// guard conditions
bool good_disk_format(cd_detected const& evt)
{
@@ -125,7 +125,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/SimpleTutorial2.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SimpleTutorial2.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SimpleTutorial2.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -66,7 +66,7 @@
}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -77,7 +77,7 @@
// sm_ptr still supported but deprecated as functors are a much better way to do the same thing
struct Stopped : public msm::front::state<msm::front::default_base_state,msm::front::sm_ptr>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -132,7 +132,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action/Guard
+ // Start Event Next Action/Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row2 < Stopped , play , Playing , Stopped , &Stopped::start_playback >,
a_row2 < Stopped , open_close , Open , Empty , &Empty::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternal.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternal.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternal.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -59,7 +59,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -68,7 +68,7 @@
// sm_ptr still supported but deprecated as functors are a much better way to do the same thing
struct Stopped : public msm::front::state<msm::front::default_base_state,msm::front::sm_ptr>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -105,7 +105,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
// guard conditions
bool good_disk_format(cd_detected const& evt)
{
@@ -146,7 +146,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternal2.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternal2.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternal2.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -83,13 +83,13 @@
// Transition table for Empty
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Internal < cd_detected , internal_action_fct ,internal_guard_fct >
// +---------+-------------+---------+---------------------+----------------------+
> {};
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -98,7 +98,7 @@
// sm_ptr still supported but deprecated as functors are a much better way to do the same thing
struct Stopped : public msm::front::state<msm::front::default_base_state,msm::front::sm_ptr>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -135,7 +135,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
// guard conditions
bool good_disk_format(cd_detected const& evt)
{
@@ -152,7 +152,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternalFunctors.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternalFunctors.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SimpleTutorialInternalFunctors.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -81,13 +81,13 @@
};
// Transition table for Empty
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Internal < cd_detected , internal_action_fct ,internal_guard_fct >
// +---------+-------------+---------+---------------------+----------------------+
> {};
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -95,7 +95,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -244,7 +244,7 @@
};
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------------+----------------------+
Row < Stopped , play , Playing , ActionSequence_
<mpl::vector<
Modified: trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -66,7 +66,7 @@
void on_exit(Event const&,FSM& ) {std::cout << "leaving: Empty" << std::endl;}
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -74,7 +74,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
// when stopped, the CD is loaded
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
@@ -223,7 +223,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------------+----------------------+
Row < Stopped , play , Playing , ActionSequence_
<mpl::vector<
Modified: trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors2.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors2.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors2.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -239,7 +239,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------------+----------------------+
Row < Stopped , play , Playing , ActionSequence_
<mpl::vector<
Modified: trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors3.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors3.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/SimpleWithFunctors3.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -229,7 +229,7 @@
// Transition table for player
struct player_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------------+----------------------+
Row < Stopped , play , Playing , ActionSequence_
<mpl::vector<
Modified: trunk/libs/msm/doc/PDF/examples/TestInternal.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/TestInternal.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/TestInternal.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -64,7 +64,7 @@
void pause_playback(pause const&) { std::cout << "player::pause_playback\n"; }
void resume_playback(end_pause const&) { std::cout << "player::resume_playback\n"; }
void stop_and_open(open_close const&) { std::cout << "player::stop_and_open\n"; }
- void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
+ void stopped_again(stop const&) {std::cout << "player::stopped_again\n";}
// guard conditions
bool good_disk_format(cd_detected const& evt)
{
@@ -119,7 +119,7 @@
void internal_action(to_ignore const&) { std::cout << "Empty::(almost)ignoring event\n"; }
// Transition table for Empty
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Row < Empty , cd_detected , none , internal_action_fct ,internal_guard_fct >,
Internal < cd_detected , internal_action_fct ,internal_guard_fct >,
a_internal< to_ignore , Empty,&Empty::internal_action >
@@ -127,7 +127,7 @@
> {};
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -135,7 +135,7 @@
};
struct Stopped : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Stopped" << std::endl;}
template <class Event,class FSM>
@@ -160,14 +160,14 @@
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Second song" << std::endl;}
template <class Event,class FSM>
void on_exit(Event const&,FSM& ) {std::cout << "finishing: Second Song" << std::endl;}
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: Third song" << std::endl;}
template <class Event,class FSM>
@@ -208,7 +208,7 @@
typedef Playing_ pl; // makes transition table cleaner
// Transition table for Playing
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+---------------+---------+---------------------+----------------------+
a_row < Song1 , NextSong , Song2 , &pl::start_next_song >,
a_row < Song2 , PreviousSong , Song1 , &pl::start_prev_song >,
@@ -220,7 +220,7 @@
// +---------+----------------+---------+---------------------+-----------------------+
struct internal_transition_table : mpl::vector<
// normal internal transition
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Internal < internal_event , playing_internal_fct,playing_internal_guard >,
// conflict between internal and the external defined above
Internal < PreviousSong , playing_internal_fct,playing_false_guard >,
@@ -252,7 +252,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------+-------------+---------+---------------------+----------------------+
a_row < Stopped , play , Playing , &p::start_playback >,
a_row < Stopped , open_close , Open , &p::open_drawer >,
Modified: trunk/libs/msm/doc/PDF/examples/char_event_dispatcher.hpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/char_event_dispatcher.hpp (original)
+++ trunk/libs/msm/doc/PDF/examples/char_event_dispatcher.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -89,4 +89,4 @@
};
}}} // boost::msm::back
-#endif //BOOST_MSM_CHAR_EVENT_DISPATCHER_HPP
\ No newline at end of file
+#endif //BOOST_MSM_CHAR_EVENT_DISPATCHER_HPP
Modified: trunk/libs/msm/doc/PDF/examples/distributed_table/Empty.hpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/distributed_table/Empty.hpp (original)
+++ trunk/libs/msm/doc/PDF/examples/distributed_table/Empty.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -33,11 +33,11 @@
void open_drawer(open_close const&);
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
//+-------------+---------+-------------+---------+---------------------------+----------------------+
msm::front::a_row2 < Empty , open_close , Open , Empty,&Empty::open_drawer >
//+-------------+---------+-------------+---------+---------------------------+----------------------+
> {};
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/libs/msm/doc/PDF/examples/distributed_table/Events.hpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/distributed_table/Events.hpp (original)
+++ trunk/libs/msm/doc/PDF/examples/distributed_table/Events.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -36,4 +36,4 @@
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/libs/msm/doc/PDF/examples/distributed_table/Open.hpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/distributed_table/Open.hpp (original)
+++ trunk/libs/msm/doc/PDF/examples/distributed_table/Open.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -26,7 +26,7 @@
using namespace msm::front;
struct Open : public msm::front::state<>
-{
+{
template <class Event,class FSM>
void on_entry(Event const& ,FSM&) {std::cout << "entering: Open" << std::endl;}
template <class Event,class FSM>
@@ -34,11 +34,11 @@
void close_drawer(open_close const&);
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
//+-------------+---------+-------------+---------+---------------------------+----------------------+
msm::front::a_row2 < Open , open_close , Empty , Open,&Open::close_drawer >
//+-------------+---------+-------------+---------+---------------------------+----------------------+
> {};
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/libs/msm/doc/PDF/examples/iPodSearch.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/iPodSearch.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/iPodSearch.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -133,7 +133,7 @@
// Transition table for player
struct transition_table : mpl::vector4<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +-----------+------------------+------------+---------------------+----------------------+
_row < MyForeach , OneSong , MyFind >,
_row < MyFind , NotFound<string> , MyForeach >,
Modified: trunk/libs/msm/doc/PDF/examples/iPod_distributed/MenuMode.hpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/iPod_distributed/MenuMode.hpp (original)
+++ trunk/libs/msm/doc/PDF/examples/iPod_distributed/MenuMode.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -24,7 +24,7 @@
struct MenuMode_ : public msm::front::state_machine_def<MenuMode_>
{
- typedef mpl::vector1<MenuActive> flag_list;
+ typedef mpl::vector1<MenuActive> flag_list;
struct WaitingForSongChoice : public msm::front::state<>
{
template <class Event,class FSM>
@@ -50,7 +50,7 @@
typedef MenuMode_ fsm; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector2<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +---------------------+------------------+-------------------+---------------------+----------------------+
_row < WaitingForSongChoice , MenuMiddleButton , StartCurrentSong >,
_row < StartCurrentSong , SelectSong , MenuExit >
Modified: trunk/libs/msm/doc/PDF/examples/iPod_distributed/PlayingMode.hpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/iPod_distributed/PlayingMode.hpp (original)
+++ trunk/libs/msm/doc/PDF/examples/iPod_distributed/PlayingMode.hpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -110,7 +110,7 @@
};
struct SetPosition : public msm::front::state<>
{
- typedef mpl::vector1<NoFastFwd> flag_list;
+ typedef mpl::vector1<NoFastFwd> flag_list;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {std::cout << "starting: PlayingMode::SetPosition" << std::endl;}
template <class Event,class FSM>
@@ -209,7 +209,7 @@
typedef PlayingMode_ fsm; // makes transition table cleaner
// Transition table for player
struct transition_table : mpl::vector19<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +--------------------+---------------------+--------------------+--------------------------+----------------------+
_row < Playing , PlayPause , Paused >,
_row < Playing , Off , Paused >,
@@ -223,7 +223,7 @@
// +--------------------+---------------------+--------------------+--------------------------+----------------------+
_row < WaitingForEnd , EndPlay , PlayingExit >,
// +--------------------+---------------------+--------------------+--------------------------+----------------------+
- msm::front::Row < NoForward , EastPressed , ForwardPressed , msm::front::none , fast_fwd_ok >,
+ msm::front::Row < NoForward , EastPressed , ForwardPressed , msm::front::none , fast_fwd_ok >,
msm::front::Row < ForwardPressed , EastReleased , NoForward , send_NextSong , msm::front::none >,
a_row < ForwardPressed , ForwardTimer , FastForward , &fsm::do_fast_forward >,
a_row < FastForward , ForwardTimer , FastForward , &fsm::do_fast_forward >,
Modified: trunk/libs/msm/doc/PDF/examples/iPod_distributed/iPod.cpp
==============================================================================
--- trunk/libs/msm/doc/PDF/examples/iPod_distributed/iPod.cpp (original)
+++ trunk/libs/msm/doc/PDF/examples/iPod_distributed/iPod.cpp 2010-06-08 13:22:26 EDT (Tue, 08 Jun 2010)
@@ -144,7 +144,7 @@
// Transition table for player
struct transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
// +-------------------+---------------+-------------------+--------------------------------+----------------------+
_row < NotHolding , Hold , Holding >,
_row < Holding , NoHold , NotHolding >,