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>

1 files changed, 15 insertions, 10 deletions

diff --git a/src/pair.hpp b/src/pair.hpp
index 67de2fd..fb447f1 100644
--- a/src/pair.hpp
+++ b/src/pair.hpp
@@ -28,27 +28,32 @@
 namespace zmq
 {
 
+    class ctx_t;
+    class msg_t;
+    class pipe_t;
+    class io_thread_t;
+
     class pair_t :
         public socket_base_t
     {
     public:
 
-        pair_t (class ctx_t *parent_, uint32_t tid_);
+        pair_t (zmq::ctx_t *parent_, uint32_t tid_);
         ~pair_t ();
 
         //  Overloads of functions from socket_base_t.
-        void xattach_pipe (class pipe_t *pipe_);
-        int xsend (class msg_t *msg_, int flags_);
-        int xrecv (class msg_t *msg_, int flags_);
+        void xattach_pipe (zmq::pipe_t *pipe_);
+        int xsend (zmq::msg_t *msg_, int flags_);
+        int xrecv (zmq::msg_t *msg_, int flags_);
         bool xhas_in ();
         bool xhas_out ();
-        void xread_activated (class pipe_t *pipe_);
-        void xwrite_activated (class pipe_t *pipe_);
-        void xterminated (class pipe_t *pipe_);
+        void xread_activated (zmq::pipe_t *pipe_);
+        void xwrite_activated (zmq::pipe_t *pipe_);
+        void xterminated (zmq::pipe_t *pipe_);
 
     private:
 
-        class pipe_t *pipe;
+        zmq::pipe_t *pipe;
 
         pair_t (const pair_t&);
         const pair_t &operator = (const pair_t&);
@@ -58,8 +63,8 @@ namespace zmq
     {
     public:
 
-        pair_session_t (class io_thread_t *io_thread_, bool connect_,
-            class socket_base_t *socket_, const options_t &options_,
+        pair_session_t (zmq::io_thread_t *io_thread_, bool connect_,
+            socket_base_t *socket_, const options_t &options_,
             const char *protocol_, const char *address_);
         ~pair_session_t ();