Merge pull request #532 from hurtonm/pgm_build_fix

Update PGM with recent changes

src/pgm_receiver.cpp

@@ -29,6 +29,7 @@
 
 #include "pgm_receiver.hpp"
 #include "session_base.hpp"
+#include "v1_decoder.hpp"
 #include "stdint.hpp"
 #include "wire.hpp"
 #include "err.hpp"
@@ -227,8 +228,8 @@ void zmq::pgm_receiver_t::in_event ()
             it->second.joined = true;
 
             //  Create and connect decoder for the peer.
-            it->second.decoder = new (std::nothrow) decoder_t (0,
-                options.maxmsgsize);
+            it->second.decoder = new (std::nothrow)
+                v1_decoder_t (0, options.maxmsgsize);
             alloc_assert (it->second.decoder);
             it->second.decoder->set_msg_sink (session);
         }

src/pgm_receiver.hpp

@@ -34,7 +34,7 @@
 #include "io_object.hpp"
 #include "i_engine.hpp"
 #include "options.hpp"
-#include "decoder.hpp"
+#include "v1_decoder.hpp"
 #include "pgm_socket.hpp"
 
 namespace zmq
@@ -85,7 +85,7 @@ namespace zmq
         struct peer_info_t
         {
             bool joined;
-            decoder_t *decoder;
+            v1_decoder_t *decoder;
         };
 
         struct tsi_comp
@@ -113,7 +113,7 @@ namespace zmq
         zmq::session_base_t *session;
 
         //  Most recently used decoder.
-        decoder_t *mru_decoder;
+        v1_decoder_t *mru_decoder;
 
         //  Number of bytes not consumed by the decoder due to pipe overflow.
         size_t pending_bytes;

src/pgm_sender.hpp

@@ -33,7 +33,7 @@
 #include "i_engine.hpp"
 #include "options.hpp"
 #include "pgm_socket.hpp"
-#include "encoder.hpp"
+#include "v1_encoder.hpp"
 
 namespace zmq
 {
@@ -76,7 +76,7 @@ namespace zmq
         bool has_rx_timer;
 
         //  Message encoder.
-        encoder_t encoder;
+        v1_encoder_t encoder;
 
         //  PGM socket.
         pgm_socket_t pgm_socket;