Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings produced with -Weffc++ in fairmq, base/MQ and Tutorial3.

Browse Source 
Remaining warnings originate from boost::msm and boost::mpl.
Also, warnings with missing initializer list entries for DeviceOptions are false positives, since those are PODs.
This commit is contained in:
Alexey Rybalchenko
2015-01-02 14:04:33 +01:00
committed by Florian Uhlig
parent a8854d36ac
commit ce58ee2302
36 changed files with 116 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fairmq/FairMQStateMachine.h
View File

@@ -47,6 +47,14 @@ namespace FairMQFSM
// defining the boost MSM state machine
struct FairMQFSM_ : public msm::front::state_machine_def<FairMQFSM_>
{
FairMQFSM_()
: fState()
, fRunningStateThread()
{}
// Destructor
virtual ~FairMQFSM_() {};
template <class Event, class FSM>
void on_entry(Event const&, FSM&)
{
@@ -109,7 +117,7 @@ namespace FairMQFSM
void operator()(EVT const&, FSM& fsm, SourceState&, TargetState&)
{
fsm.fState = RUNNING;
fsm.running_state = boost::thread(boost::bind(&FairMQFSM_::Run, &fsm));
fsm.fRunningStateThread = boost::thread(boost::bind(&FairMQFSM_::Run, &fsm));
}
};
struct StopFct
@@ -119,7 +127,7 @@ namespace FairMQFSM
{
fsm.fState = IDLE;
fsm.Terminate();
fsm.running_state.join();
fsm.fRunningStateThread.join();
}
};
struct PauseFct
@@ -128,7 +136,7 @@ namespace FairMQFSM
void operator()(EVT const&, FSM& fsm, SourceState&, TargetState&)
{
fsm.fState = WAITING;
fsm.running_state.join();
fsm.fRunningStateThread.join();
fsm.Pause();
}
};
@@ -160,10 +168,10 @@ namespace FairMQFSM
template <class FSM, class Event>
void no_transition(Event const& e, FSM&, int state)
{
LOG(STATE) << "no transition from state " << state << " on event " << typeid(e).name() << std::endl;
LOG(STATE) << "no transition from state " << state << " on event " << typeid(e).name();
}
// this is to run certain functions (e.g. Run()) as separate task
boost::thread running_state;
boost::thread fRunningStateThread;
// backward compatibility to FairMQStateMachine
enum State
{