Patches from sub-forward branch incorporated

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/src/object.hpp b/src/object.hpp
index 0f47670..fbad0ea 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -71,6 +71,7 @@ namespace zmq
         void send_activate_read (class pipe_t *destination_);
         void send_activate_write (class pipe_t *destination_,
              uint64_t msgs_read_);
+        void send_hiccup (class pipe_t *destination_, void *pipe_);
         void send_pipe_term (class pipe_t *destination_);
         void send_pipe_term_ack (class pipe_t *destination_);
         void send_term_req (class own_t *destination_,
@@ -92,6 +93,7 @@ namespace zmq
             const blob_t &peer_identity_);
         virtual void process_activate_read ();
         virtual void process_activate_write (uint64_t msgs_read_);
+        virtual void process_hiccup (void *pipe_);
         virtual void process_pipe_term ();
         virtual void process_pipe_term_ack ();
         virtual void process_term_req (class own_t *object_);