Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-16 01:51: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

4
fairmq/zeromq/FairMQMessageZMQ.cxx
View File

@@ -20,7 +20,7 @@
using namespace std;
FairMQ::Transport FairMQMessageZMQ::fTransportType = FairMQ::Transport::ZMQ;
fair::mq::Transport FairMQMessageZMQ::fTransportType = fair::mq::Transport::ZMQ;
FairMQMessageZMQ::FairMQMessageZMQ()
: fUsedSizeModified(false)
@@ -190,7 +190,7 @@ void FairMQMessageZMQ::ApplyUsedSize()
}
}
FairMQ::Transport FairMQMessageZMQ::GetType() const
fair::mq::Transport FairMQMessageZMQ::GetType() const
{
return fTransportType;
}

4
fairmq/zeromq/FairMQMessageZMQ.h
View File

@@ -46,7 +46,7 @@ class FairMQMessageZMQ : public FairMQMessage
bool SetUsedSize(const size_t size) override;
void ApplyUsedSize();
FairMQ::Transport GetType() const override;
fair::mq::Transport GetType() const override;
void Copy(const FairMQMessagePtr& msg) override;
void Copy(const FairMQMessage& msg) override;
@@ -58,7 +58,7 @@ class FairMQMessageZMQ : public FairMQMessage
size_t fUsedSize;
std::unique_ptr<zmq_msg_t> fMsg;
std::unique_ptr<zmq_msg_t> fViewMsg; // view on a subset of fMsg (treating it as user buffer)
static FairMQ::Transport fTransportType;
static fair::mq::Transport fTransportType;
zmq_msg_t* GetMessage() const;
void CloseMessage();

4
fairmq/zeromq/FairMQTransportFactoryZMQ.cxx
View File

@@ -11,7 +11,7 @@
using namespace std;
FairMQ::Transport FairMQTransportFactoryZMQ::fTransportType = FairMQ::Transport::ZMQ;
fair::mq::Transport FairMQTransportFactoryZMQ::fTransportType = fair::mq::Transport::ZMQ;
FairMQTransportFactoryZMQ::FairMQTransportFactoryZMQ(const string& id, const FairMQProgOptions* config)
: FairMQTransportFactory(id)
@@ -100,7 +100,7 @@ FairMQUnmanagedRegionPtr FairMQTransportFactoryZMQ::CreateUnmanagedRegion(const
return unique_ptr<FairMQUnmanagedRegion>(new FairMQUnmanagedRegionZMQ(size, callback));
}
FairMQ::Transport FairMQTransportFactoryZMQ::GetType() const
fair::mq::Transport FairMQTransportFactoryZMQ::GetType() const
{
return fTransportType;
}

4
fairmq/zeromq/FairMQTransportFactoryZMQ.h
View File

@@ -48,13 +48,13 @@ class FairMQTransportFactoryZMQ : public FairMQTransportFactory
FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, FairMQRegionCallback callback) const override;
FairMQ::Transport GetType() const override;
fair::mq::Transport GetType() const override;
void Interrupt() override { FairMQSocketZMQ::Interrupt(); }
void Resume() override { FairMQSocketZMQ::Resume(); }
private:
static FairMQ::Transport fTransportType;
static fair::mq::Transport fTransportType;
void* fContext;
};