Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +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
Show Stats 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&) void operator()(EVT const&, FSM& fsm, SourceState&, TargetState&)
{ {
LOG(STATE) << "Entering ERROR state"; LOG(STATE) << "Entering ERROR state";
fsm.fState = ERROR; fsm.fState = Error;
fsm.CallStateChangeCallbacks(ERROR); fsm.CallStateChangeCallbacks(Error);
} }
}; };
@ -460,7 +460,7 @@ struct FairMQFSM_ : public msmf::state_machine_def<FairMQFSM_>
enum State enum State
{ {
OK, OK,
ERROR, Error,
IDLE, IDLE,
INITIALIZING_DEVICE, INITIALIZING_DEVICE,
DEVICE_READY, DEVICE_READY,
@ -479,8 +479,8 @@ struct FairMQFSM_ : public msmf::state_machine_def<FairMQFSM_>
{ {
case OK: case OK:
return "OK"; return "OK";
case ERROR: case Error:
return "ERROR"; return "Error";
case IDLE: case IDLE:
return "IDLE"; return "IDLE";
case INITIALIZING_DEVICE: case INITIALIZING_DEVICE:

6
fairmq/PluginServices.cxx
View File

@ -12,7 +12,7 @@ using namespace fair::mq;
const std::unordered_map<std::string, PluginServices::DeviceState> PluginServices::fkDeviceStateStrMap = { const std::unordered_map<std::string, PluginServices::DeviceState> PluginServices::fkDeviceStateStrMap = {
{"OK", DeviceState::Ok}, {"OK", DeviceState::Ok},
{"ERROR", DeviceState::Error}, {"Error", DeviceState::Error},
{"IDLE", DeviceState::Idle}, {"IDLE", DeviceState::Idle},
{"INITIALIZING DEVICE", DeviceState::InitializingDevice}, {"INITIALIZING DEVICE", DeviceState::InitializingDevice},
{"DEVICE READY", DeviceState::DeviceReady}, {"DEVICE READY", DeviceState::DeviceReady},
@ -26,7 +26,7 @@ const std::unordered_map<std::string, PluginServices::DeviceState> PluginService
}; };
const std::unordered_map<PluginServices::DeviceState, std::string, tools::HashEnum<PluginServices::DeviceState>> PluginServices::fkStrDeviceStateMap = { const std::unordered_map<PluginServices::DeviceState, std::string, tools::HashEnum<PluginServices::DeviceState>> PluginServices::fkStrDeviceStateMap = {
{DeviceState::Ok, "OK"}, {DeviceState::Ok, "OK"},
{DeviceState::Error, "ERROR"}, {DeviceState::Error, "Error"},
{DeviceState::Idle, "IDLE"}, {DeviceState::Idle, "IDLE"},
{DeviceState::InitializingDevice, "INITIALIZING DEVICE"}, {DeviceState::InitializingDevice, "INITIALIZING DEVICE"},
{DeviceState::DeviceReady, "DEVICE READY"}, {DeviceState::DeviceReady, "DEVICE READY"},
@ -62,7 +62,7 @@ const std::unordered_map<PluginServices::DeviceStateTransition, std::string, too
}; };
const std::unordered_map<FairMQDevice::State, PluginServices::DeviceState, fair::mq::tools::HashEnum<FairMQDevice::State>> PluginServices::fkDeviceStateMap = { const std::unordered_map<FairMQDevice::State, PluginServices::DeviceState, fair::mq::tools::HashEnum<FairMQDevice::State>> PluginServices::fkDeviceStateMap = {
{FairMQDevice::OK, DeviceState::Ok}, {FairMQDevice::OK, DeviceState::Ok},
{FairMQDevice::ERROR, DeviceState::Error}, {FairMQDevice::Error, DeviceState::Error},
{FairMQDevice::IDLE, DeviceState::Idle}, {FairMQDevice::IDLE, DeviceState::Idle},
{FairMQDevice::INITIALIZING_DEVICE, DeviceState::InitializingDevice}, {FairMQDevice::INITIALIZING_DEVICE, DeviceState::InitializingDevice},
{FairMQDevice::DEVICE_READY, DeviceState::DeviceReady}, {FairMQDevice::DEVICE_READY, DeviceState::DeviceReady},