diff --git a/fairmq/DeviceRunner.cxx b/fairmq/DeviceRunner.cxx index 71c955d2..08474097 100644 --- a/fairmq/DeviceRunner.cxx +++ b/fairmq/DeviceRunner.cxx @@ -12,7 +12,7 @@ using namespace fair::mq; -DeviceRunner::DeviceRunner(int argc, char const* argv[]) +DeviceRunner::DeviceRunner(int argc, char* const argv[]) : fRawCmdLineArgs{tools::ToStrVector(argc, argv, false)} , fPluginManager{PluginManager::MakeFromCommandLineOptions(fRawCmdLineArgs)} , fDevice{nullptr} diff --git a/fairmq/DeviceRunner.h b/fairmq/DeviceRunner.h index 6e4bcdf8..77794c0f 100644 --- a/fairmq/DeviceRunner.h +++ b/fairmq/DeviceRunner.h @@ -51,7 +51,7 @@ namespace mq class DeviceRunner { public: - DeviceRunner(int argc, char const* argv[]); + DeviceRunner(int argc, char* const argv[]); auto Run() -> int; auto RunWithExceptionHandlers() -> int; diff --git a/fairmq/runFairMQDevice.h b/fairmq/runFairMQDevice.h index 3e161875..9c7f3eff 100644 --- a/fairmq/runFairMQDevice.h +++ b/fairmq/runFairMQDevice.h @@ -38,7 +38,7 @@ FairMQDevicePtr getDevice(const FairMQProgOptions& config); // to be implemented by the user to add custom command line options (or just with empty body) void addCustomOptions(boost::program_options::options_description&); -int main(int argc, const char** argv) +int main(int argc, char* argv[]) { using namespace fair::mq; using namespace fair::mq::hooks; diff --git a/fairmq/tools/Strings.h b/fairmq/tools/Strings.h index 435f26d0..0ee0d128 100644 --- a/fairmq/tools/Strings.h +++ b/fairmq/tools/Strings.h @@ -33,7 +33,7 @@ auto ToString(T&&... t) -> std::string } /// @brief convert command line arguments from main function to vector of strings -inline auto ToStrVector(const int argc, const char* argv[], const bool dropProgramName = true) -> std::vector +inline auto ToStrVector(const int argc, char* const argv[], const bool dropProgramName = true) -> std::vector { auto res = std::vector{}; if (dropProgramName) diff --git a/fairmq/tools/runSimpleMQStateMachine.h b/fairmq/tools/runSimpleMQStateMachine.h index be922892..e82b0b74 100644 --- a/fairmq/tools/runSimpleMQStateMachine.h +++ b/fairmq/tools/runSimpleMQStateMachine.h @@ -37,7 +37,9 @@ int runStateMachine(TMQDevice& device, FairMQProgOptions& cfg) if (control == "interactive") { - device.InteractiveStateLoop(); + LOG(ERROR) << "interactive control moved to plugin"; + return 1; + // device.InteractiveStateLoop(); } else if (control == "static") {