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

Fix compiler warnings.

Browse Source 
Initialize all data members in initializer lists.
Reorder data members in initializer list to have the same order as in the class declaration.
Comment or remove unused parameters and unused variables.
Convert all old style casts to the correct and explicit c++ cast like const_cast, static_cast,
dynamic_cast or reinterpret_cast. In most cases static_cast is used.
This commit is contained in:
Florian Uhlig 2016-03-09 15:52:10 +01:00
parent bb36147099
commit fa7040fe65
20 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fairmq/FairMQChannel.cxx
View File

@ -24,13 +24,13 @@ using namespace std;
boost::mutex FairMQChannel::fChannelMutex;
FairMQChannel::FairMQChannel()
: fType("unspecified")
: fSocket(nullptr)
, fType("unspecified")
, fMethod("unspecified")
, fAddress("unspecified")
, fSndBufSize(1000)
, fRcvBufSize(1000)
, fRateLogging(1)
, fSocket(nullptr)
, fChannelName("")
, fIsValid(false)
, fPoller(nullptr)
@ -44,13 +44,13 @@ FairMQChannel::FairMQChannel()
}
FairMQChannel::FairMQChannel(const string& type, const string& method, const string& address)
: fType(type)
: fSocket(nullptr)
, fType(type)
, fMethod(method)
, fAddress(address)
, fSndBufSize(1000)
, fRcvBufSize(1000)
, fRateLogging(1)
, fSocket(nullptr)
, fChannelName("")
, fIsValid(false)
, fPoller(nullptr)
@ -64,13 +64,13 @@ FairMQChannel::FairMQChannel(const string& type, const string& method, const str
}
FairMQChannel::FairMQChannel(const FairMQChannel& chan)
: fType(chan.fType)
: fSocket(nullptr)
, fType(chan.fType)
, fMethod(chan.fMethod)
, fAddress(chan.fAddress)
, fSndBufSize(chan.fSndBufSize)
, fRcvBufSize(chan.fRcvBufSize)
, fRateLogging(chan.fRateLogging)
, fSocket(nullptr)
, fChannelName(chan.fChannelName)
, fIsValid(false)
, fPoller(nullptr)

10
fairmq/FairMQDevice.cxx
View File

@ -225,7 +225,7 @@ bool FairMQDevice::InitChannel(FairMQChannel& ch)
size_t pos = ch.fAddress.rfind(":");
stringstream newPort;
newPort << (int)randomPort(gen);
newPort << static_cast<int>(randomPort(gen));
ch.fAddress = ch.fAddress.substr(0, pos + 1) + newPort.str();
LOG(DEBUG) << "Binding channel " << ch.fChannelName << " on " << ch.fAddress;
@ -559,19 +559,19 @@ void FairMQDevice::LogSocketRates()
for (auto itr = filteredSockets.begin(); itr != filteredSockets.end(); itr++)
{
bytesInNew.at(i) = (*itr)->GetBytesRx();
mbPerSecIn.at(i) = ((double)(bytesInNew.at(i) - bytesIn.at(i)) / (1024. * 1024.)) / (double)msSinceLastLog * 1000.;
mbPerSecIn.at(i) = (static_cast<double>(bytesInNew.at(i) - bytesIn.at(i)) / (1024. * 1024.)) / static_cast<double>(msSinceLastLog) * 1000.;
bytesIn.at(i) = bytesInNew.at(i);
msgInNew.at(i) = (*itr)->GetMessagesRx();
msgPerSecIn.at(i) = (double)(msgInNew.at(i) - msgIn.at(i)) / (double)msSinceLastLog * 1000.;
msgPerSecIn.at(i) = static_cast<double>(msgInNew.at(i) - msgIn.at(i)) / static_cast<double>(msSinceLastLog) * 1000.;
msgIn.at(i) = msgInNew.at(i);
bytesOutNew.at(i) = (*itr)->GetBytesTx();
mbPerSecOut.at(i) = ((double)(bytesOutNew.at(i) - bytesOut.at(i)) / (1024. * 1024.)) / (double)msSinceLastLog * 1000.;
mbPerSecOut.at(i) = (static_cast<double>(bytesOutNew.at(i) - bytesOut.at(i)) / (1024. * 1024.)) / static_cast<double>(msSinceLastLog) * 1000.;
bytesOut.at(i) = bytesOutNew.at(i);
msgOutNew.at(i) = (*itr)->GetMessagesTx();
msgPerSecOut.at(i) = (double)(msgOutNew.at(i) - msgOut.at(i)) / (double)msSinceLastLog * 1000.;
msgPerSecOut.at(i) = static_cast<double>(msgOutNew.at(i) - msgOut.at(i)) / static_cast<double>(msSinceLastLog) * 1000.;
msgOut.at(i) = msgOutNew.at(i);
LOG(DEBUG) << filteredChannelNames.at(i) << ": "

2
fairmq/FairMQLogger.cxx
View File

@ -20,5 +20,5 @@ timestamp_t get_timestamp()
{
struct timeval now;
gettimeofday(&now, NULL);
return now.tv_usec + (timestamp_t)now.tv_sec * 1000000;
return now.tv_usec + static_cast<timestamp_t>(now.tv_sec) * 1000000;
}

2
fairmq/devices/GenericSampler.h
View File

@ -181,7 +181,7 @@ class base_GenericSampler : public FairMQDevice, public T, public U
}
template<typename S = source_type,FairMQ::tools::enable_if_hasNot_GetHeader<S> = 0>
void SendHeader(int socketIdx) {}
void SendHeader(int /*socketIdx*/) {}
template<typename S = source_type,FairMQ::tools::enable_if_has_GetHeader<S> = 0>
void SendHeader(int socketIdx)
{

2
fairmq/nanomsg/FairMQPollerNN.cxx
View File

@ -81,7 +81,7 @@ FairMQPollerNN::FairMQPollerNN(const unordered_map<string, vector<FairMQChannel>
int index = 0;
for (string channel : channelList)
{
for (int i = 0; i < channelsMap.at(channel).size(); ++i)
for (unsigned int i = 0; i < channelsMap.at(channel).size(); ++i)
{
index = fOffsetMap[channel] + i;
items[index].fd = channelsMap.at(channel).at(i).fSocket->GetSocket(1);

6
fairmq/nanomsg/FairMQSocketNN.cxx
View File

@ -208,7 +208,7 @@ void* FairMQSocketNN::GetSocket() const
return NULL; // dummy method to comply with the interface. functionality not possible in zeromq.
}
int FairMQSocketNN::GetSocket(int nothing) const
int FairMQSocketNN::GetSocket(int /*nothing*/) const
{
return fSocket;
}
@ -250,7 +250,7 @@ unsigned long FairMQSocketNN::GetMessagesRx() const
return fMessagesRx;
}
bool FairMQSocketNN::SetSendTimeout(const int timeout, const string& address, const string& method)
bool FairMQSocketNN::SetSendTimeout(const int timeout, const string& /*address*/, const string& /*method*/)
{
if (nn_setsockopt(fSocket, NN_SOL_SOCKET, NN_SNDTIMEO, &timeout, sizeof(int)) != 0)
{
@ -274,7 +274,7 @@ int FairMQSocketNN::GetSendTimeout() const
return timeout;
}
bool FairMQSocketNN::SetReceiveTimeout(const int timeout, const string& address, const string& method)
bool FairMQSocketNN::SetReceiveTimeout(const int timeout, const string& /*address*/, const string& /*method*/)
{
if (nn_setsockopt(fSocket, NN_SOL_SOCKET, NN_RCVTIMEO, &timeout, sizeof(int)) != 0)
{

2
fairmq/options/FairMQParser.cxx
View File

@ -196,4 +196,4 @@ FairMQMap XML::UserParser(stringstream& input, const string& deviceId, const str
return ptreeToMQMap(pt, deviceId, rootNode, "xml");
}
} // end FairMQParser namespace
} // end FairMQParser namespace

2
fairmq/options/FairMQProgOptions.cxx
View File

@ -20,8 +20,8 @@ using namespace std;
FairMQProgOptions::FairMQProgOptions()
: FairProgOptions()
, fMQParserOptions("MQ-Device parser options")
, fMQOptionsInCmd("MQ-Device options")
, fMQOptionsInCfg("MQ-Device options")
, fMQOptionsInCmd("MQ-Device options")
, fMQtree()
, fFairMQMap()
{

8
fairmq/options/FairProgOptions.cxx
View File

@ -19,18 +19,18 @@ using namespace std;
/// //////////////////////////////////////////////////////////////////////////////////////////////////////
/// Constructor
FairProgOptions::FairProgOptions() :
fVarMap(),
fGenericDesc("Generic options description"),
fConfigDesc("Configuration options description"),
fHiddenDesc("Hidden options description"),
fEnvironmentDesc("Environment variables"),
fHiddenDesc("Hidden options description"),
fCmdLineOptions("Command line options"),
fConfigFileOptions("Configuration file options"),
fSeverityMap(),
fVisibleOptions("Visible options"),
fVerboseLvl("INFO"),
fUseConfigFile(false),
fConfigFile(),
fVarMap(),
fSeverityMap()
fConfigFile()
{
fGenericDesc.add_options()
("help,h", "produce help")

2
fairmq/options/ProgOptionTest/lib/FairMQParserExample.cxx
View File

@ -71,4 +71,4 @@ namespace FairMQParser
} // end FairMQParser namespace
} // end FairMQParser namespace

2
fairmq/run/runSink.cxx
View File

@ -49,7 +49,7 @@ int main(int argc, char** argv)
string filename = config.GetValue<string>("config-json-file");
string id = config.GetValue<string>("id");
int ioThreads = config.GetValue<int>("io-threads");
// int ioThreads = config.GetValue<int>("io-threads");
config.UserParser<JSON>(filename, id);

2
fairmq/run/runSplitter.cxx
View File

@ -120,7 +120,7 @@ int main(int argc, char** argv)
splitter.fChannels["data-in"].push_back(inputChannel);
for (int i = 0; i < options.outputAddress.size(); ++i)
for (unsigned int i = 0; i < options.outputAddress.size(); ++i)
{
FairMQChannel outputChannel(options.outputSocketType.at(i), options.outputMethod.at(i), options.outputAddress.at(i));
outputChannel.UpdateSndBufSize(options.outputBufSize.at(i));

2
fairmq/test/pub-sub/runTestPub.cxx
View File

@ -15,7 +15,7 @@
#include "FairMQLogger.h"
#include "FairMQTestPub.h"
int main(int argc, char** argv)
int main(int /*argc*/, char** /*argv*/)
{
FairMQTestPub testPub;
testPub.CatchSignals();

2
fairmq/test/pub-sub/runTestSub.cxx
View File

@ -17,7 +17,7 @@
#include "FairMQLogger.h"
#include "FairMQTestSub.h"
int main(int argc, char** argv)
int main(int /*argc*/, char** /*argv*/)
{
FairMQTestSub testSub;
testSub.CatchSignals();

2
fairmq/test/push-pull/runTestPull.cxx
View File

@ -15,7 +15,7 @@
#include "FairMQLogger.h"
#include "FairMQTestPull.h"
int main(int argc, char** argv)
int main(int /*argc*/, char** /*argv*/)
{
FairMQTestPull testPull;
testPull.CatchSignals();

2
fairmq/test/push-pull/runTestPush.cxx
View File

@ -15,7 +15,7 @@
#include "FairMQLogger.h"
#include "FairMQTestPush.h"
int main(int argc, char** argv)
int main(int /*argc*/, char** /*argv*/)
{
FairMQTestPush testPush;
testPush.CatchSignals();

2
fairmq/test/req-rep/runTestRep.cxx
View File

@ -17,7 +17,7 @@
#include "FairMQLogger.h"
#include "FairMQTestRep.h"
int main(int argc, char** argv)
int main(int /*argc*/, char** /*argv*/)
{
FairMQTestRep testRep;
testRep.CatchSignals();

2
fairmq/test/req-rep/runTestReq.cxx
View File

@ -17,7 +17,7 @@
#include "FairMQLogger.h"
#include "FairMQTestReq.h"
int main(int argc, char** argv)
int main(int /*argc*/, char** /*argv*/)
{
FairMQTestReq testReq;
testReq.CatchSignals();

6
fairmq/test/runTransferTimeoutTest.cxx
View File

@ -24,8 +24,8 @@ class TransferTimeoutTester : public FairMQDevice
protected:
virtual void Run()
{
bool setSndOK = false;
bool setRcvOK = false;
// bool setSndOK = false;
// bool setRcvOK = false;
bool getSndOK = false;
bool getRcvOK = false;
bool sendCanceling = false;
@ -87,7 +87,7 @@ class TransferTimeoutTester : public FairMQDevice
}
};
int main(int argc, char** argv)
int main(int /*argc*/, char** /*argv*/)
{
TransferTimeoutTester timeoutTester;
timeoutTester.CatchSignals();

6
fairmq/zeromq/FairMQMessageZMQ.cxx
View File

@ -99,7 +99,7 @@ void FairMQMessageZMQ::Copy(FairMQMessage* msg)
// DEPRECATED: Use Copy(const unique_ptr<FairMQMessage>&)
// Shares the message buffer between msg and this fMessage.
if (zmq_msg_copy(&fMessage, (zmq_msg_t*)msg->GetMessage()) != 0)
if (zmq_msg_copy(&fMessage, static_cast<zmq_msg_t*>(msg->GetMessage())) != 0)
{
LOG(ERROR) << "failed copying message, reason: " << zmq_strerror(errno);
}
@ -115,7 +115,7 @@ void FairMQMessageZMQ::Copy(FairMQMessage* msg)
void FairMQMessageZMQ::Copy(const unique_ptr<FairMQMessage>& msg)
{
// Shares the message buffer between msg and this fMessage.
if (zmq_msg_copy(&fMessage, (zmq_msg_t*)msg->GetMessage()) != 0)
if (zmq_msg_copy(&fMessage, static_cast<zmq_msg_t*>(msg->GetMessage())) != 0)
{
LOG(ERROR) << "failed copying message, reason: " << zmq_strerror(errno);
}
@ -147,4 +147,4 @@ FairMQMessageZMQ::~FairMQMessageZMQ()
{
LOG(ERROR) << "failed closing message with data, reason: " << zmq_strerror(errno);
}
}
}