Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 14 insertions, 13 deletions

diff --git a/src/io_object.hpp b/src/io_object.hpp
index 655e7f5..fb0d1e3 100644
--- a/src/io_object.hpp
+++ b/src/io_object.hpp
@@ -1,19 +1,20 @@
 /*
-    Copyright (c) 2007-2010 iMatix Corporation
+    Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
     0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the Lesser GNU General Public License as published by
+    the terms of the GNU Lesser General Public License as published by
     the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     0MQ is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Lesser GNU General Public License for more details.
+    GNU Lesser General Public License for more details.
 
-    You should have received a copy of the Lesser GNU General Public License
+    You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -40,15 +41,15 @@ namespace zmq
         io_object_t (class io_thread_t *io_thread_ = NULL);
         ~io_object_t ();
 
+        //  When migrating an object from one I/O thread to another, first
+        //  unplug it, then migrate it, then plug it to the new thread.
+        void plug (class io_thread_t *io_thread_);
+        void unplug ();
+
     protected:
 
         typedef poller_t::handle_t handle_t;
 
-        //  Derived class can init/swap the underlying I/O thread.
-        //  Caution: Remove all the file descriptors from the old I/O thread
-        //  before swapping to the new one!
-        void set_io_thread (class io_thread_t *io_thread_);
-
         //  Methods to access underlying poller object.
         handle_t add_fd (fd_t fd_);
         void rm_fd (handle_t handle_);
@@ -56,20 +57,20 @@ namespace zmq
         void reset_pollin (handle_t handle_);
         void set_pollout (handle_t handle_);
         void reset_pollout (handle_t handle_);
-        void add_timer ();
-        void cancel_timer ();
+        void add_timer (int timout_, int id_);
+        void cancel_timer (int id_);
 
         //  i_poll_events interface implementation.
         void in_event ();
         void out_event ();
-        void timer_event ();
+        void timer_event (int id_);
 
     private:
 
         poller_t *poller;
 
         io_object_t (const io_object_t&);
-        void operator = (const io_object_t&);
+        const io_object_t &operator = (const io_object_t&);
     };
 
 }