From 0b59866a84f733e5a53b0d2f32570581691747ef Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 30 May 2011 10:07:34 +0200 Subject: Patches from sub-forward branch incorporated Signed-off-by: Martin Sustrik --- src/sub.hpp | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'src/sub.hpp') diff --git a/src/sub.hpp b/src/sub.hpp index 91a5b65..b5980ba 100644 --- a/src/sub.hpp +++ b/src/sub.hpp @@ -22,8 +22,6 @@ #define __ZMQ_SUB_HPP_INCLUDED__ #include "xsub.hpp" -#include "trie.hpp" -#include "msg.hpp" namespace zmq { @@ -38,28 +36,11 @@ namespace zmq protected: int xsetsockopt (int option_, const void *optval_, size_t optvallen_); - int xsend (class msg_t *msg_, int options_); + int xsend (class msg_t *msg_, int flags_); bool xhas_out (); - int xrecv (class msg_t *msg_, int flags_); - bool xhas_in (); private: - // Check whether the message matches at least one subscription. - bool match (class msg_t *msg_); - - // The repository of subscriptions. - trie_t subscriptions; - - // If true, 'message' contains a matching message to return on the - // next recv call. - bool has_message; - msg_t message; - - // If true, part of a multipart message was already received, but - // there are following parts still waiting. - bool more; - sub_t (const sub_t&); const sub_t &operator = (const sub_t&); }; -- cgit v1.2.3