From 75fba539d02f017fa291e7843d46bc0b93ec7061 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 8 Aug 2017 15:18:07 +0100 Subject: [PATCH] Problem: PGM/NORM builds broken due to i_engine API change Solution: implement get_endpoint in the NORM and PGM engines too --- src/norm_engine.cpp | 4 ++++ src/norm_engine.hpp | 2 ++ src/pgm_receiver.cpp | 5 +++++ src/pgm_receiver.hpp | 1 + src/pgm_sender.cpp | 5 +++++ src/pgm_sender.hpp | 1 + 6 files changed, 18 insertions(+) diff --git a/src/norm_engine.cpp b/src/norm_engine.cpp index 56bd835d..2d424d2f 100644 --- a/src/norm_engine.cpp +++ b/src/norm_engine.cpp @@ -728,5 +728,9 @@ zmq::norm_engine_t::NormRxStreamState* zmq::norm_engine_t::NormRxStreamState::Li return nextItem; } // end zmq::norm_engine_t::NormRxStreamState::List::Iterator::GetNextItem() +const char *zmq::norm_engine_t::get_endpoint () const +{ + return ""; +} #endif // ZMQ_HAVE_NORM diff --git a/src/norm_engine.hpp b/src/norm_engine.hpp index 5d059ec7..d45e1946 100644 --- a/src/norm_engine.hpp +++ b/src/norm_engine.hpp @@ -46,6 +46,8 @@ namespace zmq virtual void zap_msg_available () {}; + virtual const char *get_endpoint () const; + // i_poll_events interface implementation. // (we only need in_event() for NormEvent notification) // (i.e., don't have any output events or timers (yet)) diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp index 1c9cb22b..a5357c43 100644 --- a/src/pgm_receiver.cpp +++ b/src/pgm_receiver.cpp @@ -152,6 +152,11 @@ void zmq::pgm_receiver_t::restart_input () in_event (); } +const char *zmq::pgm_receiver_t::get_endpoint () const +{ + return ""; +} + void zmq::pgm_receiver_t::in_event () { // Read data from the underlying pgm_socket. diff --git a/src/pgm_receiver.hpp b/src/pgm_receiver.hpp index 52251b15..7c854e78 100644 --- a/src/pgm_receiver.hpp +++ b/src/pgm_receiver.hpp @@ -64,6 +64,7 @@ namespace zmq void restart_input (); void restart_output (); void zap_msg_available () {} + const char *get_endpoint () const; // i_poll_events interface implementation. void in_event (); diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp index 5ee426f5..0b0e8d63 100644 --- a/src/pgm_sender.cpp +++ b/src/pgm_sender.cpp @@ -136,6 +136,11 @@ void zmq::pgm_sender_t::restart_input () zmq_assert (false); } +const char *zmq::pgm_sender_t::get_endpoint () const +{ + return ""; +} + zmq::pgm_sender_t::~pgm_sender_t () { int rc = msg.close (); diff --git a/src/pgm_sender.hpp b/src/pgm_sender.hpp index de1c72e2..973bac26 100644 --- a/src/pgm_sender.hpp +++ b/src/pgm_sender.hpp @@ -63,6 +63,7 @@ namespace zmq void restart_input (); void restart_output (); void zap_msg_available () {} + const char *get_endpoint () const; // i_poll_events interface implementation. void in_event ();