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/req.hpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/req.hpp') diff --git a/src/req.hpp b/src/req.hpp index 8fae9d4..e743cb8 100644 --- a/src/req.hpp +++ b/src/req.hpp @@ -29,16 +29,21 @@ namespace zmq { + class ctx_t; + class msg_t; + class io_thread_t; + class socket_base_t; + class req_t : public xreq_t { public: - req_t (class ctx_t *parent_, uint32_t tid_); + req_t (zmq::ctx_t *parent_, uint32_t tid_); ~req_t (); // Overloads of functions from socket_base_t. - int xsend (class msg_t *msg_, int flags_); - int xrecv (class msg_t *msg_, int flags_); + int xsend (zmq::msg_t *msg_, int flags_); + int xrecv (zmq::msg_t *msg_, int flags_); bool xhas_in (); bool xhas_out (); @@ -60,8 +65,8 @@ namespace zmq { public: - req_session_t (class io_thread_t *io_thread_, bool connect_, - class socket_base_t *socket_, const options_t &options_, + req_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_); ~req_session_t (); -- cgit v1.2.3