mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-19 08:46:44 +01:00
Merge pull request #319 from shripchenko/master
fix for: [zeromq-dev] head builds again but two failing tests
This commit is contained in:
commit
952127dfd6
@ -62,7 +62,7 @@ int zmq::address_t::to_string (std::string &addr_)
|
||||
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
|
||||
else if (protocol == "ipc") {
|
||||
if (resolved.ipc_addr) {
|
||||
return resolved.tcp_addr->to_string(addr_);
|
||||
return resolved.ipc_addr->to_string(addr_);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -546,7 +546,7 @@ int zmq::socket_base_t::term_endpoint (const char *addr_)
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Check whether message passed to the function is valid.
|
||||
// Check whether endpoint address passed to the function is valid.
|
||||
if (unlikely (!addr_)) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
|
Loading…
x
Reference in New Issue
Block a user