Revert "Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word"

This reverts commit b79aaaf473c4ef61bbd45e711d48fceb06dc9ad1.
This commit is contained in:
Ian Barber 2012-06-12 14:53:38 +01:00
parent cc230cfe60
commit a563d494bb

View File

@ -239,8 +239,9 @@ void zmq::session_base_t::terminated (pipe_t *pipe_)
{
// If we get a term signal from our held outpipe
// we can safely ignore it.
if (pipe_ == outpipe)
if (pipe_ == outpipe) {
return;
}
// Drop the reference to the deallocated pipe.
zmq_assert (pipe == pipe_);
@ -378,7 +379,7 @@ void zmq::session_base_t::process_term (int linger_)
// are processed in case the linger time is non-zero.
pipe->terminate (linger_ != 0);
// If we're storing to a pipe to be connected, we can clear that as well
// If we're storing to a to be connected, we can clear that as well
if (outpipe) {
outpipe->set_event_sink (this);
outpipe->terminate (linger_ != 0);