From 8b9bd05726c3df56d7f437889abccba3cbbffdee Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Mon, 3 May 2010 16:21:36 +0200
Subject: thread ID and dispatcher made private in object_t

---
 src/app_thread.cpp | 6 +++---
 src/io_thread.cpp  | 2 +-
 src/object.hpp     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/app_thread.cpp b/src/app_thread.cpp
index 1350248..bd5f5e3 100644
--- a/src/app_thread.cpp
+++ b/src/app_thread.cpp
@@ -123,7 +123,7 @@ bool zmq::app_thread_t::process_commands (bool block_, bool throttle_)
     //  Process all the commands from the signaling source if there is one.
     if (signal != signaler_t::no_signal) {
         command_t cmd;
-        while (dispatcher->read (signal, get_thread_slot (), &cmd))
+        while (get_dispatcher ()->read (signal, get_thread_slot (), &cmd))
             cmd.destination->process_command (cmd);
     }
 
@@ -163,7 +163,7 @@ zmq::socket_base_t *zmq::app_thread_t::create_socket (int type_)
         break;
     default:
         if (sockets.empty ())
-            dispatcher->no_sockets (this);
+            get_dispatcher ()->no_sockets (this);
         errno = EINVAL;
         return NULL;
     }
@@ -178,7 +178,7 @@ void zmq::app_thread_t::remove_socket (socket_base_t *socket_)
 {
     sockets.erase (socket_);
     if (sockets.empty ())
-        dispatcher->no_sockets (this);
+        get_dispatcher ()->no_sockets (this);
 }
 
 void zmq::app_thread_t::process_stop ()
diff --git a/src/io_thread.cpp b/src/io_thread.cpp
index e9f9aa5..b38f58c 100644
--- a/src/io_thread.cpp
+++ b/src/io_thread.cpp
@@ -76,7 +76,7 @@ void zmq::io_thread_t::in_event ()
 
         //  Process all the commands from the thread that sent the signal.
         command_t cmd;
-        while (dispatcher->read (signal, thread_slot, &cmd))
+        while (get_dispatcher ()->read (signal, get_thread_slot (), &cmd))
             cmd.destination->process_command (cmd);
     }
 }
diff --git a/src/object.hpp b/src/object.hpp
index b29c6b8..0084e1a 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -99,14 +99,14 @@ namespace zmq
         //  of processed commands here.
         virtual void process_seqnum ();
 
+    private:
+
         //  Pointer to the root of the infrastructure.
         class dispatcher_t *dispatcher;
 
         //  Slot ID of the thread the object belongs to.
         uint32_t thread_slot;
 
-    private:
-
         void send_command (command_t &cmd_);
 
         object_t (const object_t&);
-- 
cgit v1.2.3