Subject: [Boost-commit] svn:boost r62586 - in trunk/boost/msm: back front front/detail
From: christophe.j.henry_at_[hidden]
Date: 2010-06-08 13:16:48
Author: chenry
Date: 2010-06-08 13:16:47 EDT (Tue, 08 Jun 2010)
New Revision: 62586
URL: http://svn.boost.org/trac/boost/changeset/62586
Log:
corrected inspection report warnings
Text files modified:
trunk/boost/msm/back/bind_helpers.hpp | 6 ++++--
trunk/boost/msm/back/dispatch_table.hpp | 2 +-
trunk/boost/msm/back/favor_compile_time.hpp | 26 +++++++++++++-------------
trunk/boost/msm/back/state_machine.hpp | 13 ++++++-------
trunk/boost/msm/front/detail/common_states.hpp | 6 +++---
trunk/boost/msm/front/functor_row.hpp | 6 +++---
6 files changed, 30 insertions(+), 29 deletions(-)
Modified: trunk/boost/msm/back/bind_helpers.hpp
==============================================================================
--- trunk/boost/msm/back/bind_helpers.hpp (original)
+++ trunk/boost/msm/back/bind_helpers.hpp 2010-06-08 13:16:47 EDT (Tue, 08 Jun 2010)
@@ -19,9 +19,11 @@
template<class _Ty,class _Tz>
struct plus2
: public std::binary_function<_Ty, _Tz, _Ty>
- { // functor for operator+
+ {
+ // functor for operator+
_Ty operator()( _Ty _Left, _Tz _Right) const
- { // apply operator+ to operands
+ {
+ // apply operator+ to operands
return (_Left + _Right);
}
};
Modified: trunk/boost/msm/back/dispatch_table.hpp
==============================================================================
--- trunk/boost/msm/back/dispatch_table.hpp (original)
+++ trunk/boost/msm/back/dispatch_table.hpp 2010-06-08 13:16:47 EDT (Tue, 08 Jun 2010)
@@ -42,7 +42,7 @@
template< typename Seq,typename AnEvent,typename State >
struct chain_row
{
- typedef State current_state_type;
+ typedef State current_state_type;
typedef AnEvent transition_event;
// helper for building a disable/enable_if-controlled execute function
Modified: trunk/boost/msm/back/favor_compile_time.hpp
==============================================================================
--- trunk/boost/msm/back/favor_compile_time.hpp (original)
+++ trunk/boost/msm/back/favor_compile_time.hpp 2010-06-08 13:16:47 EDT (Tue, 08 Jun 2010)
@@ -41,23 +41,23 @@
}
}
private:
- msm::back::HandledEnum& res;
- Fsm* self;
- ::boost::any any_event;
- bool finished;
+ msm::back::HandledEnum& res;
+ Fsm* self;
+ ::boost::any any_event;
+ bool finished;
};
-#define BOOST_MSM_BACK_GENERATE_PROCESS_EVENT(fsmname) \
+#define BOOST_MSM_BACK_GENERATE_PROCESS_EVENT(fsmname) \
namespace boost { namespace msm { namespace back{ \
template<> \
- ::boost::msm::back::HandledEnum fsmname::process_any_event( ::boost::any const& any_event) \
- { \
- typedef ::boost::msm::back::recursive_get_transition_table<fsmname>::type stt; \
- typedef ::boost::msm::back::generate_event_set<stt>::type all_events; \
- ::boost::msm::back::HandledEnum res= ::boost::msm::back::HANDLED_FALSE; \
- ::boost::mpl::for_each<all_events, ::boost::msm::wrap< ::boost::mpl::placeholders::_1> > \
- (::boost::msm::back::process_any_event_helper<fsmname>(res,this,any_event)); \
- return res; \
+ ::boost::msm::back::HandledEnum fsmname::process_any_event( ::boost::any const& any_event) \
+ { \
+ typedef ::boost::msm::back::recursive_get_transition_table<fsmname>::type stt; \
+ typedef ::boost::msm::back::generate_event_set<stt>::type all_events; \
+ ::boost::msm::back::HandledEnum res= ::boost::msm::back::HANDLED_FALSE; \
+ ::boost::mpl::for_each<all_events, ::boost::msm::wrap< ::boost::mpl::placeholders::_1> > \
+ (::boost::msm::back::process_any_event_helper<fsmname>(res,this,any_event)); \
+ return res; \
} \
}}}
Modified: trunk/boost/msm/back/state_machine.hpp
==============================================================================
--- trunk/boost/msm/back/state_machine.hpp (original)
+++ trunk/boost/msm/back/state_machine.hpp 2010-06-08 13:16:47 EDT (Tue, 08 Jun 2010)
@@ -96,7 +96,7 @@
typedef ::boost::function<
execute_return () > deferred_fct;
typedef std::deque<deferred_fct > deferred_events_queue_t;
- typedef std::queue<transition_fct > events_queue_t;
+ typedef std::queue<transition_fct > events_queue_t;
typedef bool (*flag_handler)(library_sm&);
// all state machines are friend with each other to allow embedding any of them in another fsm
@@ -176,7 +176,6 @@
public:
// tags
- //typedef ::boost::mpl::true_ composite_state;
typedef int composite_tag;
// in case someone needs to know
@@ -1064,7 +1063,7 @@
get_state(::boost::msm::back::dummy<1> = 0)
{
return ::boost::fusion::at_key<typename ::boost::remove_reference<State>::type>(m_substate_list);
- }
+ }
// checks if a flag is active using the BinaryOp as folding function
template <class Flag,class BinaryOp>
@@ -1079,7 +1078,7 @@
::boost::bind(::boost::msm::back::deref<flag_handler>(),
::boost::bind(::boost::msm::back::plus2<flag_handler*,int>(),
flags_entries, _2)),
- ::boost::ref(*this)), _1));
+ ::boost::ref(*this)), _1));
}
// checks if a flag is active using no binary op if 1 region, or OR if > 1 regions
template <class Flag>
@@ -1445,7 +1444,7 @@
if (!handled && !is_contained() && !is_completion_event<Event>::type::value)
{
for (int i=0; i<nr_regions::value;++i)
- {
+ {
no_transition(evt,*this,this->m_states[i]);
}
}
@@ -1595,7 +1594,7 @@
// build a state list
::boost::mpl::for_each<state_list, boost::msm::wrap< ::boost::mpl::placeholders::_1> >
(init_flags<Flag>(flags_entries));
- return flags_entries;
+ return flags_entries;
}
// helper used to create a state using the correct constructor
@@ -1757,7 +1756,7 @@
// nothing to do
}
- library_sm* m_sm;
+ library_sm* m_sm;
};
// helper to copy the active states attribute
template <class region_id,int Dummy=0>
Modified: trunk/boost/msm/front/detail/common_states.hpp
==============================================================================
--- trunk/boost/msm/front/detail/common_states.hpp (original)
+++ trunk/boost/msm/front/detail/common_states.hpp 2010-06-08 13:16:47 EDT (Tue, 08 Jun 2010)
@@ -26,7 +26,7 @@
inherit_attributes():m_attributes(){}
inherit_attributes(Attributes const& the_attributes):m_attributes(the_attributes){}
// on the fly attribute creation capability
- typedef Attributes attributes_type;
+ typedef Attributes attributes_type;
template <class Index>
typename ::boost::fusion::result_of::at_key<attributes_type,
Index>::type
@@ -57,8 +57,8 @@
template<class USERBASE,class Attributes= ::boost::fusion::map<> >
struct state_base : public inherit_attributes<Attributes>, USERBASE
{
- typedef USERBASE user_state_base;
- typedef Attributes attributes_type;
+ typedef USERBASE user_state_base;
+ typedef Attributes attributes_type;
// empty implementation for the states not wishing to define an entry condition
// will not be called polymorphic way
Modified: trunk/boost/msm/front/functor_row.hpp
==============================================================================
--- trunk/boost/msm/front/functor_row.hpp (original)
+++ trunk/boost/msm/front/functor_row.hpp 2010-06-08 13:16:47 EDT (Tue, 08 Jun 2010)
@@ -257,9 +257,9 @@
FCT()(evt_,fsm_,state_);
}
private:
- EVT const& evt_;
- FSM& fsm_;
- STATE& state_;
+ EVT const& evt_;
+ FSM& fsm_;
+ STATE& state_;
};
template <class EVT,class FSM,class SourceState,class TargetState>
struct transition_action_result