Code formatting, and clean up so that xhiccuped is only handled in case the pipe isn't terminating

This commit is contained in:
Ian Barber 2012-06-09 00:07:30 +01:00
parent 0bf1d0262e
commit 5da289cd5b

View File

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