Remove warnings on Homebrew (#150)

Signed-off-by: Carlos Aguero <caguero@openrobotics.org> Co-authored-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Jul 24, 2020 · d4420b8 · d4420b8
1 parent 17b2077
commit d4420b8
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 47 deletions.
diff --git a/include/ignition/transport/Helpers.hh b/include/ignition/transport/Helpers.hh
@@ -34,8 +34,8 @@
 #define STR(x) STR_HELPER(x)
 
 // Avoid using deprecated message send/receive function when possible.
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 4, 0)
-  #define IGN_ZMQ_POST_4_4_0
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 1)
+  #define IGN_ZMQ_POST_4_3_1
 #endif
 
 namespace ignition

diff --git a/src/Node.cc b/src/Node.cc
@@ -619,8 +619,13 @@ bool Node::Unsubscribe(const std::string &_topic)
   if (!this->dataPtr->shared->localSubscribers
       .HasSubscriber(fullyQualifiedTopic))
   {
+#if (CPPZMQ_VERSION >= 40700)
+    this->dataPtr->shared->dataPtr->subscriber->set(
+      zmq::sockopt::unsubscribe, fullyQualifiedTopic);
+#else
     this->dataPtr->shared->dataPtr->subscriber->setsockopt(
       ZMQ_UNSUBSCRIBE, fullyQualifiedTopic.data(), fullyQualifiedTopic.size());
+#endif
   }
 
   // Notify to the publishers that I am no longer interested in the topic.