|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62585 - trunk/libs/msm/test
From: christophe.j.henry_at_[hidden]
Date: 2010-06-08 13:06:38
Author: chenry
Date: 2010-06-08 13:06:36 EDT (Tue, 08 Jun 2010)
New Revision: 62585
URL: http://svn.boost.org/trac/boost/changeset/62585
Log:
corrected inspection report warnings
Text files modified:
trunk/libs/msm/test/OrthogonalDeferred.cpp | 24 ++++++++++++------------
trunk/libs/msm/test/OrthogonalDeferred2.cpp | 24 ++++++++++++------------
trunk/libs/msm/test/OrthogonalDeferredEuml.cpp | 8 ++++----
trunk/libs/msm/test/SimpleInternal.cpp | 8 ++++----
trunk/libs/msm/test/SimpleInternalFunctors.cpp | 10 +++++-----
trunk/libs/msm/test/SimpleMachine.cpp | 8 ++++----
trunk/libs/msm/test/SimpleWithFunctors.cpp | 6 +++---
7 files changed, 44 insertions(+), 44 deletions(-)
Modified: trunk/libs/msm/test/OrthogonalDeferred.cpp
==============================================================================
--- trunk/libs/msm/test/OrthogonalDeferred.cpp (original)
+++ trunk/libs/msm/test/OrthogonalDeferred.cpp 2010-06-08 13:06:36 EDT (Tue, 08 Jun 2010)
@@ -74,9 +74,9 @@
int exit_counter;
};
struct Open : public msm::front::state<>
- {
+ {
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& ) {++entry_counter;}
@@ -87,8 +87,8 @@
};
struct Stopped : 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& ) {++entry_counter;}
@@ -104,7 +104,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& ) {++entry_counter;}
@@ -123,7 +123,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& ) {++entry_counter;}
@@ -133,7 +133,7 @@
int exit_counter;
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -142,7 +142,7 @@
int exit_counter;
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -161,7 +161,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
// +---------+-------------+---------+---------------------+----------------------+
_row < Song1 , NextSong , Song2 >,
row < Song2 , PreviousSong, Song1 , &pl::start_prev_song,&pl::start_prev_song_guard>,
@@ -182,7 +182,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;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
@@ -232,7 +232,7 @@
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&){}
void report_error(error_found const&) {++report_error_counter;}
void report_end_error(end_error const&) {report_end_error_counter;}
@@ -246,7 +246,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/test/OrthogonalDeferred2.cpp
==============================================================================
--- trunk/libs/msm/test/OrthogonalDeferred2.cpp (original)
+++ trunk/libs/msm/test/OrthogonalDeferred2.cpp 2010-06-08 13:06:36 EDT (Tue, 08 Jun 2010)
@@ -80,8 +80,8 @@
int exit_counter;
};
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& ) {++entry_counter;}
@@ -92,8 +92,8 @@
};
struct Stopped : 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& ) {++entry_counter;}
@@ -109,7 +109,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& ) {++entry_counter;}
@@ -128,7 +128,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& ) {++entry_counter;}
@@ -138,7 +138,7 @@
int exit_counter;
};
struct Song2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -147,7 +147,7 @@
int exit_counter;
};
struct Song3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -166,7 +166,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
// +---------+-------------+---------+---------------------+----------------------+
_row < Song1 , NextSong , Song2 >,
row < Song2 , PreviousSong, Song1 , &pl::start_prev_song,&pl::start_prev_song_guard>,
@@ -187,7 +187,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;
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
@@ -237,7 +237,7 @@
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&){}
void report_error(error_found const&) {++report_error_counter;}
void report_end_error(end_error const&) {report_end_error_counter;}
@@ -251,7 +251,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/test/OrthogonalDeferredEuml.cpp
==============================================================================
--- trunk/libs/msm/test/OrthogonalDeferredEuml.cpp (original)
+++ trunk/libs/msm/test/OrthogonalDeferredEuml.cpp 2010-06-08 13:06:36 EDT (Tue, 08 Jun 2010)
@@ -77,10 +77,10 @@
// Playing has a transition table
BOOST_MSM_EUML_TRANSITION_TABLE((
// +------------------------------------------------------------------------------+
- Song2 == Song1 + next_song ,
- Song1 == Song2 + previous_song [True_()] / ++fsm_(start_prev_song_guard_counter) ,
- Song3 == Song2 + next_song / ++fsm_(start_next_song_counter) ,
- Song2 == Song3 + previous_song [True_()] / ++fsm_(start_prev_song_guard_counter)
+ Song2 == Song1 + next_song ,
+ Song1 == Song2 + previous_song [True_()] / ++fsm_(start_prev_song_guard_counter) ,
+ Song3 == Song2 + next_song / ++fsm_(start_next_song_counter) ,
+ Song2 == Song3 + previous_song [True_()] / ++fsm_(start_prev_song_guard_counter)
// +------------------------------------------------------------------------------+
),playing_transition_table )
Modified: trunk/libs/msm/test/SimpleInternal.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleInternal.cpp (original)
+++ trunk/libs/msm/test/SimpleInternal.cpp 2010-06-08 13:06:36 EDT (Tue, 08 Jun 2010)
@@ -73,7 +73,7 @@
int exit_counter;
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -84,7 +84,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<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -125,7 +125,7 @@
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&){}
void internal_action(internal_evt const&){++internal_action_counter; }
bool internal_guard(cd_detected const&){++internal_guard_counter;return false;}
bool internal_guard2(internal_evt const&){++internal_guard_counter;return true;}
@@ -149,7 +149,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/test/SimpleInternalFunctors.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleInternalFunctors.cpp (original)
+++ trunk/libs/msm/test/SimpleInternalFunctors.cpp 2010-06-08 13:06:36 EDT (Tue, 08 Jun 2010)
@@ -97,13 +97,13 @@
};
// Transition table for Empty
struct internal_transition_table : mpl::vector<
- // Start Event Next Action Guard
+ // Start Event Next Action Guard
Internal < internal_evt , internal_action_fct ,internal_guard_fct >
// +---------+-------------+---------+---------------------+----------------------+
> {};
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -114,7 +114,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<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -155,7 +155,7 @@
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&){}
struct internal_action
{
template <class EVT,class FSM,class SourceState,class TargetState>
@@ -202,7 +202,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/test/SimpleMachine.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleMachine.cpp (original)
+++ trunk/libs/msm/test/SimpleMachine.cpp 2010-06-08 13:06:36 EDT (Tue, 08 Jun 2010)
@@ -67,7 +67,7 @@
int exit_counter;
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -78,7 +78,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<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -119,7 +119,7 @@
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
bool good_disk_format(cd_detected const& evt)
{
@@ -140,7 +140,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/test/SimpleWithFunctors.cpp
==============================================================================
--- trunk/libs/msm/test/SimpleWithFunctors.cpp (original)
+++ trunk/libs/msm/test/SimpleWithFunctors.cpp 2010-06-08 13:06:36 EDT (Tue, 08 Jun 2010)
@@ -79,7 +79,7 @@
int exit_counter;
};
struct Open : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -90,7 +90,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<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -241,7 +241,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<
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk