generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-06 13:21:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #628 from ianbarber/master

Browse Source 
Remove delay options
This commit is contained in:
Pieter Hintjens
2013-09-02 06:04:51 -07:00
parent ca8ac83e97 436cad37ec
commit 282765cab4
6 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/socket_base.cpp
View File

@@ -459,9 +459,8 @@ int zmq::socket_base_t::connect (const char *addr_)
options.type == ZMQ_SUB);
int hwms [2] = {conflate? -1 : sndhwm, conflate? -1 : rcvhwm};
bool delays [2] = {options.delay_on_disconnect, options.delay_on_close};
bool conflates [2] = {conflate, conflate};
int rc = pipepair (parents, new_pipes, hwms, delays, conflates);
int rc = pipepair (parents, new_pipes, hwms, conflates);
errno_assert (rc == 0);
// Attach local end of the pipe to this socket object.
@@ -573,9 +572,8 @@ int zmq::socket_base_t::connect (const char *addr_)
int hwms [2] = {conflate? -1 : options.sndhwm,
conflate? -1 : options.rcvhwm};
bool delays [2] = {options.delay_on_disconnect, options.delay_on_close};
bool conflates [2] = {conflate, conflate};
rc = pipepair (parents, new_pipes, hwms, delays, conflates);
rc = pipepair (parents, new_pipes, hwms, conflates);
errno_assert (rc == 0);
// Attach local end of the pipe to the socket object.