diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-17 23:40:17 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-17 23:40:17 +0200 |
| commit | efcde65cf2f3d3c2f6deab59074f3fa1ee61d6ce (patch) | |
| tree | 850c764e23d024d0a5dd840d0c49db1e7eec5836 | |
| parent | f773a9e05340d4de7dd16d0e375a12611c3995b6 (diff) | |
Dep/zmqpp: Build fix for ZMQ version 2.2.0
| -rw-r--r-- | dep/zmqpp/zmqpp/message.hpp | 1 | ||||
| -rw-r--r-- | dep/zmqpp/zmqpp/socket.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/dep/zmqpp/zmqpp/message.hpp b/dep/zmqpp/zmqpp/message.hpp index c232e032ee0..2a747bfd1db 100644 --- a/dep/zmqpp/zmqpp/message.hpp +++ b/dep/zmqpp/zmqpp/message.hpp @@ -13,6 +13,7 @@ #include <unordered_map> #include <vector> #include <utility> +#include <cassert> #include <zmq.h> diff --git a/dep/zmqpp/zmqpp/socket.cpp b/dep/zmqpp/zmqpp/socket.cpp index 0c6a795966c..8b4efe4f1d2 100644 --- a/dep/zmqpp/zmqpp/socket.cpp +++ b/dep/zmqpp/zmqpp/socket.cpp @@ -74,12 +74,14 @@ void socket::bind(endpoint_t const& endpoint) void socket::unbind(endpoint_t const& endpoint) { +#if (ZMQ_VERSION_MAJOR > 3 || (ZMQ_VERSION_MAJOR == 3 && ZMQ_VERSION_MINOR >= 2)) int result = zmq_unbind(_socket, endpoint.c_str()); if (0 != result) { throw zmq_internal_exception(); } +#endif } void socket::connect(endpoint_t const& endpoint) @@ -94,12 +96,14 @@ void socket::connect(endpoint_t const& endpoint) void socket::disconnect(endpoint_t const& endpoint) { +#if (ZMQ_VERSION_MAJOR > 3 || (ZMQ_VERSION_MAJOR == 3 && ZMQ_VERSION_MINOR >= 2)) int result = zmq_disconnect(_socket, endpoint.c_str()); if (0 != result) { throw zmq_internal_exception(); } +#endif } void socket::close() |