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/sub.hpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/sub.hpp') diff --git a/src/sub.hpp b/src/sub.hpp index bb46641..1c69b06 100644 --- a/src/sub.hpp +++ b/src/sub.hpp @@ -27,17 +27,22 @@ namespace zmq { + class ctx_t; + class msg_t; + class io_thread_t; + class socket_base_t; + class sub_t : public xsub_t { public: - sub_t (class ctx_t *parent_, uint32_t tid_); + sub_t (zmq::ctx_t *parent_, uint32_t tid_); ~sub_t (); protected: int xsetsockopt (int option_, const void *optval_, size_t optvallen_); - int xsend (class msg_t *msg_, int flags_); + int xsend (zmq::msg_t *msg_, int flags_); bool xhas_out (); private: @@ -50,8 +55,8 @@ namespace zmq { public: - sub_session_t (class io_thread_t *io_thread_, bool connect_, - class socket_base_t *socket_, const options_t &options_, + sub_session_t (zmq::io_thread_t *io_thread_, bool connect_, + zmq::socket_base_t *socket_, const options_t &options_, const char *protocol_, const char *address_); ~sub_session_t (); -- cgit v1.2.3