From a563d494bbbaf0d003bad0901a7d49ac24041857 Mon Sep 17 00:00:00 2001 From: Ian Barber Date: Tue, 12 Jun 2012 14:53:38 +0100 Subject: [PATCH] Revert "Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word" This reverts commit b79aaaf473c4ef61bbd45e711d48fceb06dc9ad1. --- src/session_base.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/session_base.cpp b/src/session_base.cpp index 14f0e264..21877b4a 100644 --- a/src/session_base.cpp +++ b/src/session_base.cpp @@ -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);