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

Fix further effc++ and reorder warnings.

Browse Source
This commit is contained in:
Alexey Rybalchenko 2016-09-07 10:23:38 +02:00 committed by Mohammad Al-Turany
parent 7c99bd77cc
commit 5e5ddd5b7b
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fairmq/FairMQDevice.cxx
View File

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

4
fairmq/nanomsg/FairMQSocketNN.cxx
View File

@ -165,7 +165,7 @@ int64_t FairMQSocketNN::Send(const vector<unique_ptr<FairMQMessage>>& msgVec, co
msgpack::packer<msgpack::sbuffer> packer(&sbuf); msgpack::packer<msgpack::sbuffer> packer(&sbuf);
// pack all parts into a single msgpack simple buffer // pack all parts into a single msgpack simple buffer
for (int i = 0; i < msgVec.size(); ++i) for (unsigned int i = 0; i < msgVec.size(); ++i)
{ {
static_cast<FairMQMessageNN*>(msgVec[i].get())->fReceiving = false; static_cast<FairMQMessageNN*>(msgVec[i].get())->fReceiving = false;
packer.pack_bin(msgVec[i]->GetSize()); packer.pack_bin(msgVec[i]->GetSize());
@ -270,7 +270,7 @@ int64_t FairMQSocketNN::Receive(vector<unique_ptr<FairMQMessage>>& msgVec, const
// offset to be used by msgpack to handle separate chunks // offset to be used by msgpack to handle separate chunks
size_t offset = 0; size_t offset = 0;
while (offset != nbytes) // continue until all parts have been read while (offset != static_cast<size_t>(nbytes)) // continue until all parts have been read
{ {
// vector of chars to hold blob (unlike char*/void* this type can be converted to by msgpack) // vector of chars to hold blob (unlike char*/void* this type can be converted to by msgpack)
std::vector<char> buf; std::vector<char> buf;

7
fairmq/tools/FairMQDDSTools.h
View File

@ -21,6 +21,11 @@ using namespace dds::intercom_api;
// container to hold channel config and corresponding dds key values // container to hold channel config and corresponding dds key values
struct DDSConfig struct DDSConfig
{ {
DDSConfig()
: subChannels()
, ddsValues()
{}
// container of sub channels, e.g. 'i' in data[i] // container of sub channels, e.g. 'i' in data[i]
vector<FairMQChannel*> subChannels; vector<FairMQChannel*> subChannels;
// dds values for the channel // dds values for the channel
@ -111,7 +116,7 @@ void HandleConfigViaDDS(TMQDevice& device)
if (mi->second.subChannels.size() == mi->second.ddsValues.size()) if (mi->second.subChannels.size() == mi->second.ddsValues.size())
{ {
auto it = mi->second.ddsValues.begin(); auto it = mi->second.ddsValues.begin();
for (int i = 0; i < mi->second.subChannels.size(); ++i) for (unsigned int i = 0; i < mi->second.subChannels.size(); ++i)
{ {
mi->second.subChannels.at(i)->UpdateAddress(it->second); mi->second.subChannels.at(i)->UpdateAddress(it->second);
++it; ++it;