From c79abee6bcaa996f50be71bd1d3075e3affb469d Mon Sep 17 00:00:00 2001 From: AJ Lewis Date: Wed, 9 Nov 2011 15:22:20 +0100 Subject: Get AIX 6.1 compiling again by making msg_t class explicit Older versions of gcc have problems with in-line forward declarations when there's a naming conflict with a global symbol. Signed-off-by: AJ Lewis Expand the original patch to all such forward declarations. Signed-off-by: Martin Sustrik --- src/xsub.hpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src/xsub.hpp') diff --git a/src/xsub.hpp b/src/xsub.hpp index 1eac390..24f8157 100644 --- a/src/xsub.hpp +++ b/src/xsub.hpp @@ -26,36 +26,39 @@ #include "dist.hpp" #include "fq.hpp" #include "trie.hpp" -#include "msg.hpp" namespace zmq { + class ctx_t; + class pipe_t; + class io_thread_t; + class xsub_t : public socket_base_t { public: - xsub_t (class ctx_t *parent_, uint32_t tid_); + xsub_t (zmq::ctx_t *parent_, uint32_t tid_); ~xsub_t (); protected: // Overloads of functions from socket_base_t. - void xattach_pipe (class pipe_t *pipe_); - int xsend (class msg_t *msg_, int flags_); + void xattach_pipe (zmq::pipe_t *pipe_); + int xsend (zmq::msg_t *msg_, int flags_); bool xhas_out (); - int xrecv (class msg_t *msg_, int flags_); + int xrecv (zmq::msg_t *msg_, int flags_); bool xhas_in (); - void xread_activated (class pipe_t *pipe_); - void xwrite_activated (class pipe_t *pipe_); + void xread_activated (zmq::pipe_t *pipe_); + void xwrite_activated (zmq::pipe_t *pipe_); void xhiccuped (pipe_t *pipe_); - void xterminated (class pipe_t *pipe_); + void xterminated (zmq::pipe_t *pipe_); private: // Check whether the message matches at least one subscription. - bool match (class msg_t *msg_); + bool match (zmq::msg_t *msg_); // Function to be applied to the trie to send all the subsciptions // upstream. @@ -89,7 +92,7 @@ namespace zmq public: xsub_session_t (class io_thread_t *io_thread_, bool connect_, - class socket_base_t *socket_, const options_t &options_, + socket_base_t *socket_, const options_t &options_, const char *protocol_, const char *address_); ~xsub_session_t (); -- cgit v1.2.3