Merge pull request #319 from shripchenko/master

fix for: [zeromq-dev] head builds again but two failing tests
This commit is contained in:
Pieter Hintjens 2012-04-21 06:03:00 -07:00
commit 952127dfd6
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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;