Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 00:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unused variables, init order and effc++ warnings.

Browse Source
This commit is contained in:
Alexey Rybalchenko 2016-09-02 13:44:30 +02:00
parent 827c8dcd45
commit 7c99bd77cc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fairmq/FairMQDevice.cxx
View File

@ -47,7 +47,9 @@ static void CallSignalHandler(int signal)
FairMQDevice::FairMQDevice() FairMQDevice::FairMQDevice()
: fChannels() : fChannels()
, fConfig(nullptr)
, fId() , fId()
, fNetworkInterface()
, fMaxInitializationAttempts(120) , fMaxInitializationAttempts(120)
, fNumIoThreads(1) , fNumIoThreads(1)
, fPortRangeMin(22000) , fPortRangeMin(22000)
@ -55,8 +57,6 @@ FairMQDevice::FairMQDevice()
, fLogIntervalInMs(1000) , fLogIntervalInMs(1000)
, fCmdSocket(nullptr) , fCmdSocket(nullptr)
, fTransportFactory(nullptr) , fTransportFactory(nullptr)
, fConfig(nullptr)
, fNetworkInterface()
, fInitialValidationFinished(false) , fInitialValidationFinished(false)
, fInitialValidationCondition() , fInitialValidationCondition()
, fInitialValidationMutex() , fInitialValidationMutex()

4
fairmq/nanomsg/FairMQSocketNN.cxx
View File

@ -191,7 +191,7 @@ int64_t FairMQSocketNN::Send(const vector<unique_ptr<FairMQMessage>>& msgVec, co
LOG(ERROR) << "Failed sending on socket " << fId << ", reason: " << nn_strerror(errno); LOG(ERROR) << "Failed sending on socket " << fId << ", reason: " << nn_strerror(errno);
return nbytes; return nbytes;
#else /*MSGPACK_FOUND*/ #else /*MSGPACK_FOUND*/
LOG(ERROR) << "Cannot use nanomsg multipart because MessagePack was not found."; LOG(ERROR) << "Cannot send message from vector of size " << msgVec.size() << " and flags " << flags << " with nanomsg multipart because MessagePack is not available.";
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
#endif /*MSGPACK_FOUND*/ #endif /*MSGPACK_FOUND*/
} }
@ -303,7 +303,7 @@ int64_t FairMQSocketNN::Receive(vector<unique_ptr<FairMQMessage>>& msgVec, const
LOG(ERROR) << "Failed receiving on socket " << fId << ", reason: " << nn_strerror(errno); LOG(ERROR) << "Failed receiving on socket " << fId << ", reason: " << nn_strerror(errno);
return nbytes; return nbytes;
#else /*MSGPACK_FOUND*/ #else /*MSGPACK_FOUND*/
LOG(ERROR) << "Cannot use nanomsg multipart because MessagePack was not found."; LOG(ERROR) << "Cannot receive message into vector of size " << msgVec.size() << " and flags " << flags << " with nanomsg multipart because MessagePack is not available.";
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
#endif /*MSGPACK_FOUND*/ #endif /*MSGPACK_FOUND*/
} }

4
fairmq/options/FairProgOptions.cxx
View File

@ -158,7 +158,7 @@ int FairProgOptions::ParseCfgFile(ifstream& ifs, const po::options_description&
} }
else else
{ {
po:store(parse_config_file(ifs, desc, allowUnregistered), varmap); po::store(parse_config_file(ifs, desc, allowUnregistered), varmap);
po::notify(varmap); po::notify(varmap);
} }
return 0; return 0;
@ -174,7 +174,7 @@ int FairProgOptions::ParseCfgFile(const string& filename, const po::options_desc
} }
else else
{ {
po:store(parse_config_file(ifs, desc, allowUnregistered), varmap); po::store(parse_config_file(ifs, desc, allowUnregistered), varmap);
po::notify(varmap); po::notify(varmap);
} }
return 0; return 0;