diff --git a/fairmq/PluginManager.h b/fairmq/PluginManager.h index 11c5f8482..6c17f84e7 100644 --- a/fairmq/PluginManager.h +++ b/fairmq/PluginManager.h @@ -115,7 +115,7 @@ class PluginManager static const std::string fgkLibPrefix; std::vector fSearchPaths; - static std::vector fgDLLKeepAlive; + static std::vector fgDLLKeepAlive; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) std::map> fPluginFactories; std::unique_ptr fPluginServices; std::map> fPlugins; diff --git a/fairmq/Properties.h b/fairmq/Properties.h index db3b069e3..24b003296 100644 --- a/fairmq/Properties.h +++ b/fairmq/Properties.h @@ -65,9 +65,9 @@ class PropertyHelper } } - static std::unordered_map fEventEmitters; + static std::unordered_map fEventEmitters; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) private: - static std::unordered_map(const Property&)>> fTypeInfos; + static std::unordered_map(const Property&)>> fTypeInfos; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) }; } diff --git a/fairmq/States.cxx b/fairmq/States.cxx index 1f733c468..466e38e36 100644 --- a/fairmq/States.cxx +++ b/fairmq/States.cxx @@ -16,7 +16,7 @@ using namespace std; namespace fair::mq { -array stateNames = +const array stateNames = { { "UNDEFINED", @@ -38,7 +38,7 @@ array stateNames = } }; -unordered_map states = +const unordered_map states = { { "UNDEFINED", State::Undefined }, { "OK", State::Ok }, @@ -58,7 +58,7 @@ unordered_map states = { "EXITING", State::Exiting } }; -array transitionNames = +const array transitionNames = { { "AUTO", @@ -76,7 +76,7 @@ array transitionNames = } }; -unordered_map transitions = +const unordered_map transitions = { { "AUTO", Transition::Auto }, { "INIT DEVICE", Transition::InitDevice }, diff --git a/fairmq/Transports.h b/fairmq/Transports.h index f47fd220d..b15a38878 100644 --- a/fairmq/Transports.h +++ b/fairmq/Transports.h @@ -31,21 +31,21 @@ struct TransportError : std::runtime_error using std::runtime_error::runtime_error; }; -static std::unordered_map TransportTypes{ +static const std::unordered_map TransportTypes{ {"default", Transport::DEFAULT}, {"zeromq", Transport::ZMQ}, {"shmem", Transport::SHM}, {"ofi", Transport::OFI} }; -static std::unordered_map TransportNames{ +static const std::unordered_map TransportNames{ {Transport::DEFAULT, "default"}, {Transport::ZMQ, "zeromq"}, {Transport::SHM, "shmem"}, {Transport::OFI, "ofi"} }; -inline std::string TransportName(Transport transport) { return TransportNames[transport]; } +inline std::string TransportName(Transport transport) { return TransportNames.at(transport); } inline Transport TransportType(const std::string& transport) try { diff --git a/fairmq/shmem/Monitor.cxx b/fairmq/shmem/Monitor.cxx index f49ec4a22..94bb20cdd 100644 --- a/fairmq/shmem/Monitor.cxx +++ b/fairmq/shmem/Monitor.cxx @@ -43,7 +43,7 @@ namespace bipc = ::boost::interprocess; namespace { - volatile sig_atomic_t gSignalStatus = 0; + volatile sig_atomic_t gSignalStatus = 0; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) } namespace fair::mq::shmem diff --git a/fairmq/tools/InstanceLimit.h b/fairmq/tools/InstanceLimit.h index 5e09e9dfe..47b132f98 100644 --- a/fairmq/tools/InstanceLimit.h +++ b/fairmq/tools/InstanceLimit.h @@ -43,11 +43,11 @@ struct InstanceLimiter } } - static int fCount; + static int fCount; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) }; template -int InstanceLimiter::fCount(0); +int InstanceLimiter::fCount(0); // NOLINT(cppcoreguidelines-avoid-non-const-global-variables) } // namespace fair::mq::tools