From 338ff0f618e1613f0f6643c4ce03c98572ceeee8 Mon Sep 17 00:00:00 2001 From: Nathan Hughes Date: Thu, 12 Dec 2024 19:22:08 +0000 Subject: [PATCH] update deprecated zmq functions --- src/zmq_interface.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/zmq_interface.cpp b/src/zmq_interface.cpp index bcc3e34..1474ec4 100644 --- a/src/zmq_interface.cpp +++ b/src/zmq_interface.cpp @@ -101,17 +101,30 @@ struct ZmqReceiver::Detail { Detail(const std::string& url, size_t, bool conflate) { socket.reset(new zmq::socket_t(ZmqContextHolder::instance().context(), ZMQ_SUB)); socket->connect(url); +#if ZMQ_VERSION < ZMQ_MAKE_VERSION(4, 7, 0) socket->setsockopt(ZMQ_SUBSCRIBE, "", 0); +#else + socket->set(zmq::sockopt::subscribe, "", 0); +#endif + if (conflate) { int conflate_flag = 1; +#if ZMQ_VERSION < ZMQ_MAKE_VERSION(4, 7, 0) socket->setsockopt(ZMQ_CONFLATE, &conflate_flag, sizeof(conflate_flag)); +#else + socket->set(zmq::sockopt::conflate, &conflate_flag, sizeof(conflate_flag)); +#endif } } ~Detail() = default; bool recv(size_t timeout_ms) { +#if ZMQ_VERSION < ZMQ_MAKE_VERSION(4, 7, 1) if (!socket->connected()) { +#else + if (!socket) { +#endif return false; }