Transports: use transportType as static member.

This commit is contained in:
Alexey Rybalchenko
2017-03-14 11:41:56 +01:00
committed by Mohammad Al-Turany
parent b237b3f9d7
commit 3c73c690f7
12 changed files with 24 additions and 15 deletions

View File

@@ -20,9 +20,8 @@
using namespace std;
static FairMQ::Transport gTransportType = FairMQ::Transport::ZMQ;
string FairMQMessageZMQ::fDeviceID = string();
FairMQ::Transport FairMQMessageZMQ::fTransportType = FairMQ::Transport::ZMQ;
FairMQMessageZMQ::FairMQMessageZMQ()
: fMessage()
@@ -105,7 +104,7 @@ void FairMQMessageZMQ::SetDeviceId(const string& deviceId)
FairMQ::Transport FairMQMessageZMQ::GetType() const
{
return gTransportType;
return fTransportType;
}
void FairMQMessageZMQ::Copy(const unique_ptr<FairMQMessage>& msg)

View File

@@ -52,6 +52,7 @@ class FairMQMessageZMQ : public FairMQMessage
private:
zmq_msg_t fMessage;
static std::string fDeviceID;
static FairMQ::Transport fTransportType;
};
#endif /* FAIRMQMESSAGEZMQ_H_ */

View File

@@ -18,7 +18,7 @@
using namespace std;
static FairMQ::Transport gTransportType = FairMQ::Transport::ZMQ;
FairMQ::Transport FairMQTransportFactoryZMQ::fTransportType = FairMQ::Transport::ZMQ;
FairMQTransportFactoryZMQ::FairMQTransportFactoryZMQ()
{
@@ -64,5 +64,5 @@ FairMQPollerPtr FairMQTransportFactoryZMQ::CreatePoller(const FairMQSocket& cmdS
FairMQ::Transport FairMQTransportFactoryZMQ::GetType() const
{
return gTransportType;
return fTransportType;
}

View File

@@ -42,6 +42,9 @@ class FairMQTransportFactoryZMQ : public FairMQTransportFactory
virtual FairMQ::Transport GetType() const;
virtual ~FairMQTransportFactoryZMQ() {};
private:
static FairMQ::Transport fTransportType;
};
#endif /* FAIRMQTRANSPORTFACTORYZMQ_H_ */