Revert "Code formatting, and clean up so that xhiccuped is only handled in case…

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

This reverts commit 5da289cd.

src/socket_base.cpp

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