I/O object hierarchy implemented

1 files changed, 12 insertions, 11 deletions

diff --git a/src/object.hpp b/src/object.hpp
index c75a95a..e083ce3 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -53,18 +53,19 @@ namespace zmq
 
         //  Zombify particular socket. In other words, pass the ownership to
         //  the context.
-        void zombify (class socket_base_t *socket_);
+        void zombify_socket (class socket_base_t *socket_);
 
         //  Derived object can use these functions to send commands
         //  to other objects.
         void send_stop ();
-        void send_plug (class owned_t *destination_, bool inc_seqnum_ = true);
-        void send_own (class socket_base_t *destination_,
-            class owned_t *object_);
+        void send_plug (class own_t *destination_,
+            bool inc_seqnum_ = true);
+        void send_own (class own_t *destination_,
+            class own_t *object_);
         void send_attach (class session_t *destination_,
              struct i_engine *engine_, const blob_t &peer_identity_,
              bool inc_seqnum_ = true);
-        void send_bind (class socket_base_t *destination_,
+        void send_bind (class own_t *destination_,
              class reader_t *in_pipe_, class writer_t *out_pipe_,
              const blob_t &peer_identity_, bool inc_seqnum_ = true);
         void send_revive (class object_t *destination_);
@@ -72,16 +73,16 @@ namespace zmq
              uint64_t msgs_read_);
         void send_pipe_term (class writer_t *destination_);
         void send_pipe_term_ack (class reader_t *destination_);
-        void send_term_req (class socket_base_t *destination_,
-            class owned_t *object_);
-        void send_term (class owned_t *destination_);
-        void send_term_ack (class socket_base_t *destination_);
+        void send_term_req (class own_t *destination_,
+            class own_t *object_);
+        void send_term (class own_t *destination_);
+        void send_term_ack (class own_t *destination_);
 
         //  These handlers can be overloaded by the derived objects. They are
         //  called when command arrives from another thread.
         virtual void process_stop ();
         virtual void process_plug ();
-        virtual void process_own (class owned_t *object_);
+        virtual void process_own (class own_t *object_);
         virtual void process_attach (struct i_engine *engine_,
             const blob_t &peer_identity_);
         virtual void process_bind (class reader_t *in_pipe_,
@@ -90,7 +91,7 @@ namespace zmq
         virtual void process_reader_info (uint64_t msgs_read_);
         virtual void process_pipe_term ();
         virtual void process_pipe_term_ack ();
-        virtual void process_term_req (class owned_t *object_);
+        virtual void process_term_req (class own_t *object_);
         virtual void process_term ();
         virtual void process_term_ack ();