From 72f5cdef58ae4f7e3b7ea2a0d6ea2cacf8a4aef1 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 24 May 2018 11:07:39 +0200 Subject: [PATCH] Fix various warnings -Wunused-parameter -Wreorder -Wsign-compare -Wunused-private-field --- examples/multiple-transports/Sink.cxx | 2 -- examples/multiple-transports/Sink.h | 2 -- examples/region/Sampler.cxx | 2 +- fairmq/FairMQChannel.cxx | 8 ++++---- fairmq/FairMQDevice.cxx | 2 +- fairmq/FairMQStateMachine.cxx | 10 +++++----- fairmq/plugins/DDS/DDS.h | 4 ++-- fairmq/shmem/FairMQSocketSHM.cxx | 4 ++-- test/helper/devices/TestPairLeft.cxx | 3 ++- test/helper/devices/TestPairRight.cxx | 3 ++- test/plugin_services/_config.cxx | 2 +- test/plugins/_plugin_manager.cxx | 2 +- test/state_machine/_state_machine.cxx | 2 +- 13 files changed, 22 insertions(+), 24 deletions(-) diff --git a/examples/multiple-transports/Sink.cxx b/examples/multiple-transports/Sink.cxx index c0d1051c..84fc9ec1 100644 --- a/examples/multiple-transports/Sink.cxx +++ b/examples/multiple-transports/Sink.cxx @@ -23,8 +23,6 @@ Sink::Sink() : fMaxIterations(0) , fNumIterations1(0) , fNumIterations2(0) - , fReceived1(false) - , fReceived2(false) { // register a handler for data arriving on "data" channel OnData("data1", &Sink::HandleData1); diff --git a/examples/multiple-transports/Sink.h b/examples/multiple-transports/Sink.h index e849e62d..559bb991 100644 --- a/examples/multiple-transports/Sink.h +++ b/examples/multiple-transports/Sink.h @@ -36,8 +36,6 @@ class Sink : public FairMQDevice uint64_t fMaxIterations; uint64_t fNumIterations1; uint64_t fNumIterations2; - bool fReceived1; - bool fReceived2; }; } // namespace example_multiple_transports diff --git a/examples/region/Sampler.cxx b/examples/region/Sampler.cxx index 1fbf09d9..678c321e 100644 --- a/examples/region/Sampler.cxx +++ b/examples/region/Sampler.cxx @@ -38,7 +38,7 @@ void Sampler::InitTask() fRegion = FairMQUnmanagedRegionPtr(NewUnmanagedRegionFor("data", 0, 10000000, - [this](void* data, size_t size, void* hint) { // callback to be called when message buffers no longer needed by transport + [this](void* /*data*/, size_t /*size*/, void* /*hint*/) { // callback to be called when message buffers no longer needed by transport --fNumUnackedMsgs; if (fMaxIterations > 0) { diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx index 25a1fe26..f5b955df 100644 --- a/fairmq/FairMQChannel.cxx +++ b/fairmq/FairMQChannel.cxx @@ -28,6 +28,7 @@ FairMQChannel::FairMQChannel() , fType("unspecified") , fMethod("unspecified") , fAddress("unspecified") + , fTransportType(fair::mq::Transport::DEFAULT) , fSndBufSize(1000) , fRcvBufSize(1000) , fSndKernelSize(0) @@ -35,7 +36,6 @@ FairMQChannel::FairMQChannel() , fRateLogging(1) , fName("") , fIsValid(false) - , fTransportType(fair::mq::Transport::DEFAULT) , fTransportFactory(nullptr) , fMultipart(false) , fModified(true) @@ -48,6 +48,7 @@ FairMQChannel::FairMQChannel(const string& type, const string& method, const str , fType(type) , fMethod(method) , fAddress(address) + , fTransportType(fair::mq::Transport::DEFAULT) , fSndBufSize(1000) , fRcvBufSize(1000) , fSndKernelSize(0) @@ -55,7 +56,6 @@ FairMQChannel::FairMQChannel(const string& type, const string& method, const str , fRateLogging(1) , fName("") , fIsValid(false) - , fTransportType(fair::mq::Transport::DEFAULT) , fTransportFactory(nullptr) , fMultipart(false) , fModified(true) @@ -68,6 +68,7 @@ FairMQChannel::FairMQChannel(const string& name, const string& type, std::shared , fType(type) , fMethod("unspecified") , fAddress("unspecified") + , fTransportType(factory->GetType()) , fSndBufSize(1000) , fRcvBufSize(1000) , fSndKernelSize(0) @@ -75,7 +76,6 @@ FairMQChannel::FairMQChannel(const string& name, const string& type, std::shared , fRateLogging(1) , fName(name) , fIsValid(false) - , fTransportType(factory->GetType()) , fTransportFactory(factory) , fMultipart(false) , fModified(true) @@ -88,6 +88,7 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan) , fType(chan.fType) , fMethod(chan.fMethod) , fAddress(chan.fAddress) + , fTransportType(chan.fTransportType) , fSndBufSize(chan.fSndBufSize) , fRcvBufSize(chan.fRcvBufSize) , fSndKernelSize(chan.fSndKernelSize) @@ -95,7 +96,6 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan) , fRateLogging(chan.fRateLogging) , fName(chan.fName) , fIsValid(false) - , fTransportType(chan.fTransportType) , fTransportFactory(nullptr) , fMultipart(chan.fMultipart) , fModified(chan.fModified) diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx index cc7f4e4e..b9482bd9 100644 --- a/fairmq/FairMQDevice.cxx +++ b/fairmq/FairMQDevice.cxx @@ -501,7 +501,7 @@ void FairMQDevice::RunWrapper() while (CheckCurrentState(RUNNING) && ConditionalRun()) { if (fRate > 0.001) { - auto timespan = chrono::duration_cast(Clock::now() - reftime).count() - fLastTime; + auto timespan = static_cast(chrono::duration_cast(Clock::now() - reftime).count() - fLastTime); if (timespan < period) { TimeScale sleepfor(period - timespan); this_thread::sleep_for(sleepfor); diff --git a/fairmq/FairMQStateMachine.cxx b/fairmq/FairMQStateMachine.cxx index d688656c..6979b149 100644 --- a/fairmq/FairMQStateMachine.cxx +++ b/fairmq/FairMQStateMachine.cxx @@ -72,8 +72,7 @@ struct Machine_ : public msmf::state_machine_def { public: Machine_() - : fState() - , fWork() + : fWork() , fWorkAvailableCondition() , fWorkDoneCondition() , fWorkMutex() @@ -83,6 +82,7 @@ struct Machine_ : public msmf::state_machine_def , fStateChangeSignal() , fStateChangeSignalsMap() , fTerminationRequested(false) + , fState() , fWorkerThread() {} @@ -521,8 +521,8 @@ _Pragma("GCC diagnostic pop") using namespace fair::mq::fsm; FairMQStateMachine::FairMQStateMachine() - : fFsm(new FairMQFSM) - , fChangeStateMutex() + : fChangeStateMutex() + , fFsm(new FairMQFSM) { static_pointer_cast(fFsm)->fInitWrapperHandler = bind(&FairMQStateMachine::InitWrapper, this); static_pointer_cast(fFsm)->fInitTaskWrapperHandler = bind(&FairMQStateMachine::InitTaskWrapper, this); @@ -775,4 +775,4 @@ int FairMQStateMachine::GetEventNumber(const string& event) LOG(error) << "Requested number for non-existent event... " << event << endl << "Supported are: INIT_DEVICE, INIT_TASK, RUN, PAUSE, STOP, RESET_DEVICE, RESET_TASK, END, ERROR_FOUND"; return -1; -} \ No newline at end of file +} diff --git a/fairmq/plugins/DDS/DDS.h b/fairmq/plugins/DDS/DDS.h index b4d230d5..5efb6a30 100644 --- a/fairmq/plugins/DDS/DDS.h +++ b/fairmq/plugins/DDS/DDS.h @@ -52,8 +52,8 @@ struct IofN , fEntries() {} - int fI; - int fN; + unsigned int fI; + unsigned int fN; std::vector fEntries; }; diff --git a/fairmq/shmem/FairMQSocketSHM.cxx b/fairmq/shmem/FairMQSocketSHM.cxx index 58d6cdaa..d016a06a 100644 --- a/fairmq/shmem/FairMQSocketSHM.cxx +++ b/fairmq/shmem/FairMQSocketSHM.cxx @@ -238,7 +238,7 @@ int FairMQSocketSHM::ReceiveImpl(FairMQMessagePtr& msg, const int flags, const i } } -int64_t FairMQSocketSHM::SendImpl(vector& msgVec, const int flags, const int timeout) +int64_t FairMQSocketSHM::SendImpl(vector& msgVec, const int flags, const int /*timeout*/) { const unsigned int vecSize = msgVec.size(); int64_t totalSize = 0; @@ -318,7 +318,7 @@ int64_t FairMQSocketSHM::SendImpl(vector& msgVec, const int fl } -int64_t FairMQSocketSHM::ReceiveImpl(vector& msgVec, const int flags, const int timeout) +int64_t FairMQSocketSHM::ReceiveImpl(vector& msgVec, const int flags, const int /*timeout*/) { int64_t totalSize = 0; diff --git a/test/helper/devices/TestPairLeft.cxx b/test/helper/devices/TestPairLeft.cxx index fb36f0e9..60923ce0 100644 --- a/test/helper/devices/TestPairLeft.cxx +++ b/test/helper/devices/TestPairLeft.cxx @@ -8,6 +8,7 @@ #include +#include #include namespace fair @@ -53,7 +54,7 @@ class PairLeft : public FairMQDevice if (ret > 0) { auto content = std::string{static_cast(msg6->GetData()), msg6->GetSize()}; LOG(info) << ret << ", " << msg6->GetSize() << ", '" << content << "'"; - if (msg6->GetSize() == ret && content == "testdata1234") counter++; + if (msg6->GetSize() == static_cast(ret) && content == "testdata1234") counter++; } if (counter == 6) LOG(info) << "Simple message with short text data successfull"; diff --git a/test/helper/devices/TestPairRight.cxx b/test/helper/devices/TestPairRight.cxx index a4779bd0..2771f083 100644 --- a/test/helper/devices/TestPairRight.cxx +++ b/test/helper/devices/TestPairRight.cxx @@ -7,6 +7,7 @@ ********************************************************************************/ #include +#include #include #include @@ -51,7 +52,7 @@ class PairRight : public FairMQDevice if (ret > 0) { auto content = std::string{static_cast(msg5->GetData()), msg5->GetSize()}; LOG(info) << ret << ", " << msg5->GetSize() << ", '" << content << "'"; - if (msg5->GetSize() == ret && content == "testdata1234") counter++; + if (msg5->GetSize() == static_cast(ret) && content == "testdata1234") counter++; } auto msg6(NewSimpleMessageFor("data", 0, "testdata1234")); if (Send(msg6, "data") >= 0) counter++; diff --git a/test/plugin_services/_config.cxx b/test/plugin_services/_config.cxx index c140a379..898df504 100644 --- a/test/plugin_services/_config.cxx +++ b/test/plugin_services/_config.cxx @@ -63,7 +63,7 @@ TEST_F(PluginServices, ConfigCallbacks) if (key == "chans.data.0.address") { ASSERT_EQ(value, "tcp://localhost:4321"); } }); - mServices.SubscribeToPropertyChange("test", [](const string& key, int value) { + mServices.SubscribeToPropertyChange("test", [](const string& key, int /*value*/) { if(key == "chans.data.0.rcvBufSize") { FAIL(); // should not be called because we unsubscribed } diff --git a/test/plugins/_plugin_manager.cxx b/test/plugins/_plugin_manager.cxx index b68721cc..8fa2f94c 100644 --- a/test/plugins/_plugin_manager.cxx +++ b/test/plugins/_plugin_manager.cxx @@ -88,7 +88,7 @@ TEST(PluginManager, LoadPluginStatic) // program options auto count = 0; - mgr.ForEachPluginProgOptions([&count](const options_description& d){ ++count; }); + mgr.ForEachPluginProgOptions([&count](const options_description&){ ++count; }); ASSERT_EQ(count, 1); mgr.WaitForPluginsToReleaseDeviceControl(); diff --git a/test/state_machine/_state_machine.cxx b/test/state_machine/_state_machine.cxx index 8bbf3538..b0be3e44 100644 --- a/test/state_machine/_state_machine.cxx +++ b/test/state_machine/_state_machine.cxx @@ -38,7 +38,7 @@ TEST(StateMachine, RegularFSM) ASSERT_NO_THROW(fsm.ChangeState(T::Automatic)); int cnt{0}; - fsm.SubscribeToStateQueued("test", [&](S newState, S lastState){ + fsm.SubscribeToStateQueued("test", [&](S /*newState*/, S /*lastState*/){ ++cnt; });