summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2009-12-15 23:50:32 +0100
committerMartin Sustrik <sustrik@fastmq.commkdir>2009-12-15 23:50:32 +0100
commit7479871cde46371c593f35c0ace3d9e984fddb1a (patch)
tree28fce83216cf66f90fa4483cbdcb6395c707b9e9 /src
parent8aa0908635f255e2d533539d5330b92b62dc88ba (diff)
parent3e640836674872961f48efb4dc7badb20d736407 (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src')
-rw-r--r--src/zmq_listener_init.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/zmq_listener_init.cpp b/src/zmq_listener_init.cpp
index 97ea477..f7b3001 100644
--- a/src/zmq_listener_init.cpp
+++ b/src/zmq_listener_init.cpp
@@ -121,6 +121,7 @@ class zmq::socket_base_t *zmq::zmq_listener_init_t::get_owner ()
const char *zmq::zmq_listener_init_t::get_session_name ()
{
zmq_assert (false);
+ return NULL;
}
void zmq::zmq_listener_init_t::process_plug ()