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

Revert "Merge branch 'master' of github.com:ianbarber/libzmq"

Browse Source 
This reverts commit 3345902979, reversing
changes made to 889b0e6f29.
This commit is contained in:
Ian Barber
2012-06-12 14:13:17 +01:00
parent dde69fb9fb
commit 029d3dfae2
15 changed files with 119 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/socket_base.cpp
View File

@@ -970,11 +970,7 @@ void zmq::socket_base_t::write_activated (pipe_t *pipe_)
void zmq::socket_base_t::hiccuped (pipe_t *pipe_)
{
if (options.delay_attach_on_connect == 1)
pipe_->terminate (false);
else
// Notify derived sockets of the hiccup
xhiccuped (pipe_);
xhiccuped (pipe_);
}
void zmq::socket_base_t::terminated (pipe_t *pipe_)