Merge pull request #3020

03ac3890 zmq: use older 3-arg version of setsockopt (stoffu)
This commit is contained in:
Riccardo Spagni 2018-01-25 16:40:03 -08:00
commit 5e211b4186
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -102,7 +102,7 @@ bool ZmqServer::addTCPSocket(std::string address, std::string port)
rep_socket.reset(new zmq::socket_t(context, ZMQ_REP)); rep_socket.reset(new zmq::socket_t(context, ZMQ_REP));
rep_socket->setsockopt(ZMQ_RCVTIMEO, DEFAULT_RPC_RECV_TIMEOUT_MS); rep_socket->setsockopt(ZMQ_RCVTIMEO, &DEFAULT_RPC_RECV_TIMEOUT_MS, sizeof(DEFAULT_RPC_RECV_TIMEOUT_MS));
std::string bind_address = addr_prefix + address + std::string(":") + port; std::string bind_address = addr_prefix + address + std::string(":") + port;
rep_socket->bind(bind_address.c_str()); rep_socket->bind(bind_address.c_str());