From 835e893e54598ff474067cc68b787440baf6b05c Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Wed, 5 May 2010 14:24:54 +0200 Subject: dispatcher_t class renamed to ctx_t --- src/zmq.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/zmq.cpp') diff --git a/src/zmq.cpp b/src/zmq.cpp index e97cb64..ecb3d3d 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -29,11 +29,11 @@ #include "streamer.hpp" #include "socket_base.hpp" #include "app_thread.hpp" -#include "dispatcher.hpp" #include "msg_content.hpp" #include "platform.hpp" #include "stdint.hpp" #include "config.hpp" +#include "ctx.hpp" #include "err.hpp" #include "fd.hpp" @@ -263,15 +263,14 @@ void *zmq_init (int /*app_threads_*/, int io_threads_, int /*flags_*/) #endif // Create 0MQ context. - zmq::dispatcher_t *dispatcher = new (std::nothrow) zmq::dispatcher_t ( - (uint32_t) io_threads_); - zmq_assert (dispatcher); - return (void*) dispatcher; + zmq::ctx_t *ctx = new (std::nothrow) zmq::ctx_t ((uint32_t) io_threads_); + zmq_assert (ctx); + return (void*) ctx; } -int zmq_term (void *dispatcher_) +int zmq_term (void *ctx_) { - int rc = ((zmq::dispatcher_t*) dispatcher_)->term (); + int rc = ((zmq::ctx_t*) ctx_)->term (); int en = errno; #if defined ZMQ_HAVE_OPENPGM @@ -284,9 +283,9 @@ int zmq_term (void *dispatcher_) return rc; } -void *zmq_socket (void *dispatcher_, int type_) +void *zmq_socket (void *ctx_, int type_) { - return (void*) (((zmq::dispatcher_t*) dispatcher_)->create_socket (type_)); + return (void*) (((zmq::ctx_t*) ctx_)->create_socket (type_)); } int zmq_close (void *s_) -- cgit v1.2.3