|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62663 - trunk/libs/msm/test
From: christophe.j.henry_at_[hidden]
Date: 2010-06-09 11:10:24
Author: chenry
Date: 2010-06-09 11:10:23 EDT (Wed, 09 Jun 2010)
New Revision: 62663
URL: http://svn.boost.org/trac/boost/changeset/62663
Log:
fixed unit test compile error
Text files modified:
trunk/libs/msm/test/Anonymous.cpp | 6 +++---
trunk/libs/msm/test/CompositeEuml.cpp | 8 ++++----
trunk/libs/msm/test/CompositeMachine.cpp | 14 +++++++-------
trunk/libs/msm/test/Constructor.cpp | 8 ++++----
trunk/libs/msm/test/History.cpp | 14 +++++++-------
5 files changed, 25 insertions(+), 25 deletions(-)
Modified: trunk/libs/msm/test/Anonymous.cpp
==============================================================================
--- trunk/libs/msm/test/Anonymous.cpp (original)
+++ trunk/libs/msm/test/Anonymous.cpp 2010-06-09 11:10:23 EDT (Wed, 09 Jun 2010)
@@ -53,7 +53,7 @@
int exit_counter;
};
struct State2 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -63,7 +63,7 @@
};
struct State3 : public msm::front::state<>
- {
+ {
template <class Event,class FSM>
void on_entry(Event const&,FSM& ) {++entry_counter;}
template <class Event,class FSM>
@@ -104,7 +104,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/test/CompositeEuml.cpp
==============================================================================
--- trunk/libs/msm/test/CompositeEuml.cpp (original)
+++ trunk/libs/msm/test/CompositeEuml.cpp 2010-06-09 11:10:23 EDT (Wed, 09 Jun 2010)
@@ -64,10 +64,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) ,
Region2State2 == Region2State1 + region2_evt
// +------------------------------------------------------------------------------+
),playing_transition_table )
Modified: trunk/libs/msm/test/CompositeMachine.cpp
==============================================================================
--- trunk/libs/msm/test/CompositeMachine.cpp (original)
+++ trunk/libs/msm/test/CompositeMachine.cpp 2010-06-09 11:10:23 EDT (Wed, 09 Jun 2010)
@@ -58,7 +58,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>
@@ -69,7 +69,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>
@@ -105,7 +105,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>
@@ -114,7 +114,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>
@@ -133,7 +133,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>,
@@ -173,7 +173,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&){}
//guards
bool can_close_drawer(open_close const&)
{
@@ -186,7 +186,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/Constructor.cpp
==============================================================================
--- trunk/libs/msm/test/Constructor.cpp (original)
+++ trunk/libs/msm/test/Constructor.cpp 2010-06-09 11:10:23 EDT (Wed, 09 Jun 2010)
@@ -71,7 +71,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>
@@ -82,7 +82,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>
@@ -123,7 +123,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)
{
@@ -143,7 +143,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/History.cpp
==============================================================================
--- trunk/libs/msm/test/History.cpp (original)
+++ trunk/libs/msm/test/History.cpp 2010-06-09 11:10:23 EDT (Wed, 09 Jun 2010)
@@ -58,7 +58,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>
@@ -69,7 +69,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>
@@ -105,7 +105,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>
@@ -114,7 +114,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>
@@ -133,7 +133,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>,
@@ -173,7 +173,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&){}
//guards
bool can_close_drawer(open_close const&)
{
@@ -186,7 +186,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 >,
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