Merge branch 'master' into events

This commit is contained in:
Lourens Naudé
2012-05-04 02:35:22 +01:00
9 changed files with 94 additions and 42 deletions

View File

@@ -839,10 +839,6 @@ void zmq::socket_base_t::process_bind (pipe_t *pipe_)
attach_pipe (pipe_);
}
void zmq::socket_base_t::process_unplug ()
{
}
void zmq::socket_base_t::process_term (int linger_)
{
// Unregister all inproc endpoints associated with this socket.
@@ -1037,4 +1033,4 @@ void zmq::socket_base_t::monitor_event (int event_, ...)
options.monitor ((void *)this, event_, &data);
va_end (args);
}
}
}