mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-31 06:35:06 +01:00
Merge branch 'master' of git@github.com:sustrik/zeromq2
This commit is contained in:
commit
3ebe9932f9
@ -54,10 +54,11 @@ zmq::devpoll_t::devpoll_t ()
|
||||
|
||||
zmq::devpoll_t::~devpoll_t ()
|
||||
{
|
||||
worker.stop ();
|
||||
|
||||
// Make sure there are no fds registered on shutdown.
|
||||
zmq_assert (load.get () == 0);
|
||||
|
||||
worker.stop ();
|
||||
close (devpoll_fd);
|
||||
}
|
||||
|
||||
|
@ -42,10 +42,11 @@ zmq::kqueue_t::kqueue_t ()
|
||||
|
||||
zmq::kqueue_t::~kqueue_t ()
|
||||
{
|
||||
worker.stop ();
|
||||
|
||||
// Make sure there are no fds registered on shutdown.
|
||||
zmq_assert (load.get () == 0);
|
||||
|
||||
worker.stop ();
|
||||
close (kqueue_fd);
|
||||
}
|
||||
|
||||
|
@ -52,10 +52,10 @@ zmq::poll_t::poll_t () :
|
||||
|
||||
zmq::poll_t::~poll_t ()
|
||||
{
|
||||
worker.stop ();
|
||||
|
||||
// Make sure there are no fds registered on shutdown.
|
||||
zmq_assert (load.get () == 0);
|
||||
|
||||
worker.stop ();
|
||||
}
|
||||
|
||||
zmq::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_)
|
||||
|
Loading…
x
Reference in New Issue
Block a user