3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 07:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #319 from shripchenko/master

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/address.cpp
View File

@ -62,7 +62,7 @@ int zmq::address_t::to_string (std::string &addr_)
#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
else if (protocol == "ipc") { else if (protocol == "ipc") {
if (resolved.ipc_addr) { if (resolved.ipc_addr) {
return resolved.tcp_addr->to_string(addr_); return resolved.ipc_addr->to_string(addr_);
} }
} }
#endif #endif

2
src/socket_base.cpp
View File

@ -546,7 +546,7 @@ int zmq::socket_base_t::term_endpoint (const char *addr_)
return -1; return -1;
} }
// Check whether message passed to the function is valid. // Check whether endpoint address passed to the function is valid.
if (unlikely (!addr_)) { if (unlikely (!addr_)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;