summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-01-07 10:57:53 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-01-07 10:57:53 +0100
commitb92491d93d7759fefdc96552f5319d7a38e47895 (patch)
tree87a04baf107ad87893fd0fef5f26328a32336f4e
parent8953a94893fe39a10b044ea62cf6971d36801880 (diff)
downloaddabmod-b92491d93d7759fefdc96552f5319d7a38e47895.tar.gz
dabmod-b92491d93d7759fefdc96552f5319d7a38e47895.tar.bz2
dabmod-b92491d93d7759fefdc96552f5319d7a38e47895.zip
Simplify OutputZeroMQ a bit
-rw-r--r--src/OutputZeroMQ.cpp9
-rw-r--r--src/OutputZeroMQ.h7
2 files changed, 5 insertions, 11 deletions
diff --git a/src/OutputZeroMQ.cpp b/src/OutputZeroMQ.cpp
index 93fe3c0..69f4aa1 100644
--- a/src/OutputZeroMQ.cpp
+++ b/src/OutputZeroMQ.cpp
@@ -32,8 +32,8 @@
#if defined(HAVE_ZEROMQ)
-OutputZeroMQ::OutputZeroMQ(std::string endpoint, int type, Buffer* dataOut)
- : ModOutput(),
+OutputZeroMQ::OutputZeroMQ(std::string endpoint, int type, Buffer* dataOut) :
+ ModOutput(),
m_type(type),
m_zmq_context(1),
m_zmq_sock(m_zmq_context, type),
@@ -59,11 +59,6 @@ OutputZeroMQ::OutputZeroMQ(std::string endpoint, int type, Buffer* dataOut)
m_zmq_sock.bind(m_endpoint.c_str());
}
-OutputZeroMQ::~OutputZeroMQ()
-{
- PDEBUG("OutputZeroMQ::~OutputZeroMQ() @ %p\n", this);
-}
-
int OutputZeroMQ::process(Buffer* dataIn)
{
PDEBUG("OutputZeroMQ::process"
diff --git a/src/OutputZeroMQ.h b/src/OutputZeroMQ.h
index 3107225..be2451b 100644
--- a/src/OutputZeroMQ.h
+++ b/src/OutputZeroMQ.h
@@ -38,10 +38,9 @@
class OutputZeroMQ : public ModOutput
{
public:
- OutputZeroMQ(std::string endpoint, int type, Buffer* dataOut = NULL);
- virtual ~OutputZeroMQ();
- virtual int process(Buffer* dataIn);
- const char* name() { return m_name.c_str(); }
+ OutputZeroMQ(std::string endpoint, int type, Buffer* dataOut = nullptr);
+ virtual int process(Buffer* dataIn) override;
+ const char* name() override { return m_name.c_str(); }
protected:
int m_type; // zmq socket type