Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 13 insertions, 12 deletions

diff --git a/src/xreq.hpp b/src/xreq.hpp
index 8ee0bb9..73af21f 100644
--- a/src/xreq.hpp
+++ b/src/xreq.hpp
@@ -1,19 +1,21 @@
 /*
-    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/>.
 */
 
@@ -31,18 +33,14 @@ namespace zmq
     {
     public:
 
-        xreq_t (class app_thread_t *parent_);
+        xreq_t (class ctx_t *parent_, uint32_t tid_);
         ~xreq_t ();
 
+    protected:
+
         //  Overloads of functions from socket_base_t.
         void xattach_pipes (class reader_t *inpipe_, class writer_t *outpipe_,
             const blob_t &peer_identity_);
-        void xdetach_inpipe (class reader_t *pipe_);
-        void xdetach_outpipe (class writer_t *pipe_);
-        void xkill (class reader_t *pipe_);
-        void xrevive (class reader_t *pipe_);
-        void xrevive (class writer_t *pipe_);
-        int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
         int xsend (zmq_msg_t *msg_, int flags_);
         int xrecv (zmq_msg_t *msg_, int flags_);
         bool xhas_in ();
@@ -50,13 +48,16 @@ namespace zmq
 
     private:
 
+        //  Hook into the termination process.
+        void process_term (int linger_);
+
         //  Messages are fair-queued from inbound pipes. And load-balanced to
         //  the outbound pipes.
         fq_t fq;
         lb_t lb;
 
         xreq_t (const xreq_t&);
-        void operator = (const xreq_t&);
+        const xreq_t &operator = (const xreq_t&);
     };
 
 }