From b45f968c67b7becd68d547a02688b432df8f105c Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Mon, 27 Jan 2014 16:51:23 +0100 Subject: [PATCH] change argument passing by value/reference --- fairmq/FairMQBenchmarkSampler.cxx | 9 ++++----- fairmq/FairMQBenchmarkSampler.h | 8 ++++---- fairmq/FairMQConfigurable.cxx | 2 -- fairmq/FairMQConfigurable.h | 2 -- fairmq/FairMQSampler.cxx | 8 ++++---- fairmq/FairMQSampler.h | 8 ++++---- fairmq/FairMQSocketZMQ.cxx | 1 + fairmq/FairMQTransportFactory.h | 2 +- fairmq/FairMQTransportFactoryNN.cxx | 2 +- fairmq/FairMQTransportFactoryNN.h | 2 +- fairmq/FairMQTransportFactoryZMQ.cxx | 2 +- fairmq/FairMQTransportFactoryZMQ.h | 2 +- 12 files changed, 22 insertions(+), 26 deletions(-) diff --git a/fairmq/FairMQBenchmarkSampler.cxx b/fairmq/FairMQBenchmarkSampler.cxx index 8dd9579c..b3b16b29 100644 --- a/fairmq/FairMQBenchmarkSampler.cxx +++ b/fairmq/FairMQBenchmarkSampler.cxx @@ -113,7 +113,7 @@ void FairMQBenchmarkSampler::Log(int intervalInMs) } } -void FairMQBenchmarkSampler::SetProperty(const int& key, const string& value, const int& slot/*= 0*/) +void FairMQBenchmarkSampler::SetProperty(const int key, const string& value, const int slot/*= 0*/) { switch (key) { default: @@ -122,7 +122,7 @@ void FairMQBenchmarkSampler::SetProperty(const int& key, const string& value, co } } -string FairMQBenchmarkSampler::GetProperty(const int& key, const string& default_/*= ""*/, const int& slot/*= 0*/) +string FairMQBenchmarkSampler::GetProperty(const int key, const string& default_/*= ""*/, const int slot/*= 0*/) { switch (key) { default: @@ -130,7 +130,7 @@ string FairMQBenchmarkSampler::GetProperty(const int& key, const string& default } } -void FairMQBenchmarkSampler::SetProperty(const int& key, const int& value, const int& slot/*= 0*/) +void FairMQBenchmarkSampler::SetProperty(const int key, const int value, const int slot/*= 0*/) { switch (key) { case EventSize: @@ -145,7 +145,7 @@ void FairMQBenchmarkSampler::SetProperty(const int& key, const int& value, const } } -int FairMQBenchmarkSampler::GetProperty(const int& key, const int& default_/*= 0*/, const int& slot/*= 0*/) +int FairMQBenchmarkSampler::GetProperty(const int key, const int default_/*= 0*/, const int slot/*= 0*/) { switch (key) { case EventSize: @@ -156,4 +156,3 @@ int FairMQBenchmarkSampler::GetProperty(const int& key, const int& default_/*= 0 return FairMQDevice::GetProperty(key, default_, slot); } } - diff --git a/fairmq/FairMQBenchmarkSampler.h b/fairmq/FairMQBenchmarkSampler.h index 04313e98..1d293c08 100644 --- a/fairmq/FairMQBenchmarkSampler.h +++ b/fairmq/FairMQBenchmarkSampler.h @@ -29,10 +29,10 @@ class FairMQBenchmarkSampler: public FairMQDevice virtual ~FairMQBenchmarkSampler(); void Log(int intervalInMs); void ResetEventCounter(); - virtual void SetProperty(const int& key, const string& value, const int& slot = 0); - virtual string GetProperty(const int& key, const string& default_ = "", const int& slot = 0); - virtual void SetProperty(const int& key, const int& value, const int& slot = 0); - virtual int GetProperty(const int& key, const int& default_ = 0, const int& slot = 0); + virtual void SetProperty(const int key, const string& value, const int slot = 0); + virtual string GetProperty(const int key, const string& default_ = "", const int slot = 0); + virtual void SetProperty(const int key, const int value, const int slot = 0); + virtual int GetProperty(const int key, const int default_ = 0, const int slot = 0); protected: int fEventSize; int fEventRate; diff --git a/fairmq/FairMQConfigurable.cxx b/fairmq/FairMQConfigurable.cxx index 1de383fd..cf8e6340 100644 --- a/fairmq/FairMQConfigurable.cxx +++ b/fairmq/FairMQConfigurable.cxx @@ -33,5 +33,3 @@ int FairMQConfigurable::GetProperty(const int key, const int default_/*= 0*/, co FairMQConfigurable::~FairMQConfigurable() { } - - diff --git a/fairmq/FairMQConfigurable.h b/fairmq/FairMQConfigurable.h index 3a5db663..1b4c5016 100644 --- a/fairmq/FairMQConfigurable.h +++ b/fairmq/FairMQConfigurable.h @@ -24,8 +24,6 @@ class FairMQConfigurable virtual void SetProperty(const int key, const int value, const int slot = 0); virtual int GetProperty(const int key, const int default_ = 0, const int slot = 0); virtual ~FairMQConfigurable(); - - // TODO: by value for integers }; #endif /* FAIRMQCONFIGURABLE_H_ */ diff --git a/fairmq/FairMQSampler.cxx b/fairmq/FairMQSampler.cxx index a85b6a82..377d3dcc 100644 --- a/fairmq/FairMQSampler.cxx +++ b/fairmq/FairMQSampler.cxx @@ -161,7 +161,7 @@ void FairMQSampler::ListenToCommands() FairMQLogger::GetInstance()->Log(FairMQLogger::DEBUG, ">>>>>>> stopping commandListener <<<<<<<"); } -void FairMQSampler::SetProperty(const int& key, const string& value, const int& slot/*= 0*/) +void FairMQSampler::SetProperty(const int key, const string& value, const int slot/*= 0*/) { switch (key) { case InputFile: @@ -179,7 +179,7 @@ void FairMQSampler::SetProperty(const int& key, const string& value, const int& } } -string FairMQSampler::GetProperty(const int& key, const string& default_/*= ""*/, const int& slot/*= 0*/) +string FairMQSampler::GetProperty(const int key, const string& default_/*= ""*/, const int slot/*= 0*/) { switch (key) { case InputFile: @@ -193,7 +193,7 @@ string FairMQSampler::GetProperty(const int& key, const string& default_/*= ""*/ } } -void FairMQSampler::SetProperty(const int& key, const int& value, const int& slot/*= 0*/) +void FairMQSampler::SetProperty(const int key, const int value, const int slot/*= 0*/) { switch (key) { case EventRate: @@ -205,7 +205,7 @@ void FairMQSampler::SetProperty(const int& key, const int& value, const int& slo } } -int FairMQSampler::GetProperty(const int& key, const int& default_/*= 0*/, const int& slot/*= 0*/) +int FairMQSampler::GetProperty(const int key, const int default_/*= 0*/, const int slot/*= 0*/) { switch (key) { case EventRate: diff --git a/fairmq/FairMQSampler.h b/fairmq/FairMQSampler.h index 8c6b8f16..8f541eca 100644 --- a/fairmq/FairMQSampler.h +++ b/fairmq/FairMQSampler.h @@ -39,10 +39,10 @@ class FairMQSampler: public FairMQDevice void ResetEventCounter(); virtual void ListenToCommands(); - virtual void SetProperty(const int& key, const string& value, const int& slot = 0); - virtual string GetProperty(const int& key, const string& default_ = "", const int& slot = 0); - virtual void SetProperty(const int& key, const int& value, const int& slot = 0); - virtual int GetProperty(const int& key, const int& default_ = 0, const int& slot = 0); + virtual void SetProperty(const int key, const string& value, const int slot = 0); + virtual string GetProperty(const int key, const string& default_ = "", const int slot = 0); + virtual void SetProperty(const int key, const int value, const int slot = 0); + virtual int GetProperty(const int key, const int default_ = 0, const int slot = 0); protected: FairRunAna* fFairRunAna; int fNumEvents; diff --git a/fairmq/FairMQSocketZMQ.cxx b/fairmq/FairMQSocketZMQ.cxx index b40f3491..8f55ae7a 100644 --- a/fairmq/FairMQSocketZMQ.cxx +++ b/fairmq/FairMQSocketZMQ.cxx @@ -135,6 +135,7 @@ void* FairMQSocketZMQ::GetSocket() int FairMQSocketZMQ::GetSocket(int nothing) { // dummy method to compy with the interface. functionality not possible in zeromq. + return -1; } void FairMQSocketZMQ::SetOption(const string& option, const void* value, size_t valueSize) diff --git a/fairmq/FairMQTransportFactory.h b/fairmq/FairMQTransportFactory.h index ac30b737..939573c8 100644 --- a/fairmq/FairMQTransportFactory.h +++ b/fairmq/FairMQTransportFactory.h @@ -22,7 +22,7 @@ class FairMQTransportFactory virtual FairMQMessage* CreateMessage() = 0; virtual FairMQMessage* CreateMessage(size_t size) = 0; virtual FairMQMessage* CreateMessage(void* data, size_t size) = 0; - virtual FairMQSocket* CreateSocket(string type, int num) = 0; + virtual FairMQSocket* CreateSocket(const string& type, int num) = 0; virtual FairMQPoller* CreatePoller(const vector& inputs) = 0; virtual ~FairMQTransportFactory() {}; diff --git a/fairmq/FairMQTransportFactoryNN.cxx b/fairmq/FairMQTransportFactoryNN.cxx index 039be997..6a5eaa9f 100644 --- a/fairmq/FairMQTransportFactoryNN.cxx +++ b/fairmq/FairMQTransportFactoryNN.cxx @@ -27,7 +27,7 @@ FairMQMessage* FairMQTransportFactoryNN::CreateMessage(void* data, size_t size) return new FairMQMessageNN(data, size); } -FairMQSocket* FairMQTransportFactoryNN::CreateSocket(string type, int num) +FairMQSocket* FairMQTransportFactoryNN::CreateSocket(const string& type, int num) { return new FairMQSocketNN(type, num); } diff --git a/fairmq/FairMQTransportFactoryNN.h b/fairmq/FairMQTransportFactoryNN.h index 21456fe4..0a6a2e74 100644 --- a/fairmq/FairMQTransportFactoryNN.h +++ b/fairmq/FairMQTransportFactoryNN.h @@ -23,7 +23,7 @@ class FairMQTransportFactoryNN : public FairMQTransportFactory virtual FairMQMessage* CreateMessage(); virtual FairMQMessage* CreateMessage(size_t size); virtual FairMQMessage* CreateMessage(void* data, size_t size); - virtual FairMQSocket* CreateSocket(string type, int num); + virtual FairMQSocket* CreateSocket(const string& type, int num); virtual FairMQPoller* CreatePoller(const vector& inputs); diff --git a/fairmq/FairMQTransportFactoryZMQ.cxx b/fairmq/FairMQTransportFactoryZMQ.cxx index 3661115d..170a23d7 100644 --- a/fairmq/FairMQTransportFactoryZMQ.cxx +++ b/fairmq/FairMQTransportFactoryZMQ.cxx @@ -27,7 +27,7 @@ FairMQMessage* FairMQTransportFactoryZMQ::CreateMessage(void* data, size_t size) return new FairMQMessageZMQ(data, size); } -FairMQSocket* FairMQTransportFactoryZMQ::CreateSocket(string type, int num) +FairMQSocket* FairMQTransportFactoryZMQ::CreateSocket(const string& type, int num) { return new FairMQSocketZMQ(type, num); } diff --git a/fairmq/FairMQTransportFactoryZMQ.h b/fairmq/FairMQTransportFactoryZMQ.h index 92b94848..3863425d 100644 --- a/fairmq/FairMQTransportFactoryZMQ.h +++ b/fairmq/FairMQTransportFactoryZMQ.h @@ -24,7 +24,7 @@ class FairMQTransportFactoryZMQ : public FairMQTransportFactory virtual FairMQMessage* CreateMessage(); virtual FairMQMessage* CreateMessage(size_t size); virtual FairMQMessage* CreateMessage(void* data, size_t size); - virtual FairMQSocket* CreateSocket(string type, int num); + virtual FairMQSocket* CreateSocket(const string& type, int num); virtual FairMQPoller* CreatePoller(const vector& inputs);