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 name conflict with FairLogger+FairMQStateMachine

Browse Source
This commit is contained in:
Alexey Rybalchenko
2017-09-26 17:01:05 +02:00
committed by Mohammad Al-Turany
parent 6349438829
commit 17d7cd8ce4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fairmq/FairMQStateMachine.h
View File

@@ -357,8 +357,8 @@ struct FairMQFSM_ : public msmf::state_machine_def<FairMQFSM_>
void operator()(EVT const&, FSM& fsm, SourceState&, TargetState&)
{
LOG(STATE) << "Entering ERROR state";
fsm.fState = ERROR;
fsm.CallStateChangeCallbacks(ERROR);
fsm.fState = Error;
fsm.CallStateChangeCallbacks(Error);
}
};
@@ -460,7 +460,7 @@ struct FairMQFSM_ : public msmf::state_machine_def<FairMQFSM_>
enum State
{
OK,
ERROR,
Error,
IDLE,
INITIALIZING_DEVICE,
DEVICE_READY,
@@ -479,8 +479,8 @@ struct FairMQFSM_ : public msmf::state_machine_def<FairMQFSM_>
{
case OK:
return "OK";
case ERROR:
return "ERROR";
case Error:
return "Error";
case IDLE:
return "IDLE";
case INITIALIZING_DEVICE: