Remove delay options

These were exposed to users, but have subsequently been removed as
sockopts. They are currently only being used by ZAP, so I've moved it to
a simpl function call (actually it's only used in one case even in that,
so there may be a further simplification possible there).
This commit is contained in:
Ian Barber
2013-08-18 11:16:21 +01:00
parent cb35fd7bfe
commit 531d3ebc09
6 changed files with 23 additions and 27 deletions

View File

@@ -451,8 +451,7 @@ int zmq::socket_base_t::connect (const char *addr_)
object_t *parents [2] = {this, peer.socket};
pipe_t *new_pipes [2] = {NULL, NULL};
int hwms [2] = {sndhwm, rcvhwm};
bool delays [2] = {options.delay_on_disconnect, options.delay_on_close};
int rc = pipepair (parents, new_pipes, hwms, delays);
int rc = pipepair (parents, new_pipes, hwms);
errno_assert (rc == 0);
// Attach local end of the pipe to this socket object.
@@ -555,8 +554,7 @@ int zmq::socket_base_t::connect (const char *addr_)
object_t *parents [2] = {this, session};
pipe_t *new_pipes [2] = {NULL, NULL};
int hwms [2] = {options.sndhwm, options.rcvhwm};
bool delays [2] = {options.delay_on_disconnect, options.delay_on_close};
rc = pipepair (parents, new_pipes, hwms, delays);
rc = pipepair (parents, new_pipes, hwms);
errno_assert (rc == 0);
// Attach local end of the pipe to the socket object.