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/poller_base.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/poller_base.hpp') diff --git a/src/poller_base.hpp b/src/poller_base.hpp index 808ed38..c184358 100644 --- a/src/poller_base.hpp +++ b/src/poller_base.hpp @@ -29,6 +29,8 @@ namespace zmq { + struct i_poll_events; + class poller_base_t { public: @@ -43,10 +45,10 @@ namespace zmq // Add a timeout to expire in timeout_ milliseconds. After the // expiration timer_event on sink_ object will be called with // argument set to id_. - void add_timer (int timeout_, struct i_poll_events *sink_, int id_); + void add_timer (int timeout_, zmq::i_poll_events *sink_, int id_); // Cancel the timer created by sink_ object with ID equal to id_. - void cancel_timer (struct i_poll_events *sink_, int id_); + void cancel_timer (zmq::i_poll_events *sink_, int id_); protected: @@ -65,7 +67,7 @@ namespace zmq // List of active timers. struct timer_info_t { - struct i_poll_events *sink; + zmq::i_poll_events *sink; int id; }; typedef std::multimap timers_t; -- cgit v1.2.3