diff options
author | AJ Lewis <aj.lewis@quantum.com> | 2011-11-09 15:22:20 +0100 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-11-09 15:22:20 +0100 |
commit | c79abee6bcaa996f50be71bd1d3075e3affb469d (patch) | |
tree | ddbbe8d56fd65f0949b3f990472365a4b3e01f63 /src/poller_base.hpp | |
parent | 89962a825697dd9eca057c032ec61de71b075539 (diff) |
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 <aj.lewis@quantum.com>
Expand the original patch to all such forward declarations.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/poller_base.hpp')
-rw-r--r-- | src/poller_base.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
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 <uint64_t, timer_info_t> timers_t; |