From 74ae19ac1f31d1264e425f8fd9caa4d277d65c49 Mon Sep 17 00:00:00 2001 From: Sergey KHripchenko Date: Sat, 21 Apr 2012 18:36:20 +0400 Subject: [PATCH] spaces deleted --- src/pipe.cpp | 2 +- src/session_base.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pipe.cpp b/src/pipe.cpp index 2a7e6ef4..b7c04dc4 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -359,7 +359,7 @@ void zmq::pipe_t::terminate (bool delay_) // active state. else if (state == delimited) { send_pipe_term (peer); - state = terminated; + state = terminated; } // There are no other states. diff --git a/src/session_base.cpp b/src/session_base.cpp index b99e3786..6dc6799d 100644 --- a/src/session_base.cpp +++ b/src/session_base.cpp @@ -357,6 +357,7 @@ void zmq::session_base_t::proceed_with_term () void zmq::session_base_t::timer_event (int id_) { + // Linger period expired. We can proceed with termination even though // there are still pending messages to be sent. zmq_assert (id_ == linger_timer_id); @@ -376,13 +377,13 @@ void zmq::session_base_t::detached () } // Reconnect. - if (options.reconnect_ivl != -1) - start_connecting (true); + if (options.reconnect_ivl != -1) + start_connecting (true); // For subscriber sockets we hiccup the inbound pipe, which will cause // the socket object to resend all the subscriptions. if (pipe && (options.type == ZMQ_SUB || options.type == ZMQ_XSUB)) - pipe->hiccup (); + pipe->hiccup (); } void zmq::session_base_t::start_connecting (bool wait_)