summaryrefslogtreecommitdiff
path: root/src/zmq.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@jozsi.(none)>2009-09-07 11:01:42 +0200
committerMartin Sustrik <sustrik@jozsi.(none)>2009-09-07 11:01:42 +0200
commitd62c74232a4c1edd38004933afd0c7dc119bd98b (patch)
tree72881bf447ea1d29459b2cd32819dfd951a78797 /src/zmq.cpp
parent11a6cb925f7ff3d17f48edccc886839b4d49ef0b (diff)
parent63b56d7fb38624c32111f9188d54b6fefb10a0e5 (diff)
Merge branch 'master' of git://github.com/sustrik/zeromq2
Diffstat (limited to 'src/zmq.cpp')
-rw-r--r--src/zmq.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/zmq.cpp b/src/zmq.cpp
index 49096ad..0ffd530 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -183,8 +183,7 @@ void *zmq_init (int app_threads_, int io_threads_)
int zmq_term (void *dispatcher_)
{
- delete (zmq::dispatcher_t*) dispatcher_;
- return 0;
+ return ((zmq::dispatcher_t*) dispatcher_)->term ();
}
void *zmq_socket (void *dispatcher_, int type_)