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

Fix namespaces in Transports.h and add conversion map

Browse Source
This commit is contained in:
Alexey Rybalchenko
2018-05-04 14:58:14 +02:00
committed by Mohammad Al-Turany
parent 155618af57
commit 7a4fd96b27
19 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fairmq/FairMQChannel.cxx
View File

@@ -36,7 +36,7 @@ FairMQChannel::FairMQChannel()
, fRateLogging(1)
, fName("")
, fIsValid(false)
, fTransportType(FairMQ::Transport::DEFAULT)
, fTransportType(fair::mq::Transport::DEFAULT)
, fTransportFactory(nullptr)
, fMultipart(false)
, fModified(true)
@@ -57,7 +57,7 @@ FairMQChannel::FairMQChannel(const string& type, const string& method, const str
, fRateLogging(1)
, fName("")
, fIsValid(false)
, fTransportType(FairMQ::Transport::DEFAULT)
, fTransportType(fair::mq::Transport::DEFAULT)
, fTransportFactory(nullptr)
, fMultipart(false)
, fModified(true)
@@ -99,7 +99,7 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan)
, fRateLogging(chan.fRateLogging)
, fName(chan.fName)
, fIsValid(false)
, fTransportType(FairMQ::Transport::DEFAULT)
, fTransportType(fair::mq::Transport::DEFAULT)
, fTransportFactory(nullptr)
, fMultipart(chan.fMultipart)
, fModified(chan.fModified)
@@ -120,7 +120,7 @@ FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan)
fSocket = nullptr;
fName = chan.fName;
fIsValid = false;
fTransportType = FairMQ::Transport::DEFAULT;
fTransportType = fair::mq::Transport::DEFAULT;
fTransportFactory = nullptr;
return *this;
@@ -587,7 +587,7 @@ bool FairMQChannel::ValidateChannel()
}
// validate channel transport
if (FairMQ::TransportTypes.find(fTransportName) == FairMQ::TransportTypes.end())
if (fair::mq::TransportTypes.find(fTransportName) == fair::mq::TransportTypes.end())
{
ss << "INVALID";
LOG(debug) << ss.str();