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 #685 from hintjens/master

Browse Source 
Build/test errors on OS/X with clang++
This commit is contained in:
Richard Newton 2013-09-26 02:45:14 -07:00
commit 5271bc9db3
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/options.cpp
View File

@ -286,7 +286,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
break; break;
case ZMQ_ZAP_DOMAIN: case ZMQ_ZAP_DOMAIN:
if (optvallen_ >= 0 && optvallen_ < 256) { if (optvallen_ < 256) {
zap_domain.assign ((const char *) optval_, optvallen_); zap_domain.assign ((const char *) optval_, optvallen_);
return 0; return 0;
} }

1
tests/test_stream.cpp
View File

@ -102,7 +102,6 @@ test_stream_to_dealer (void)
assert (rc >= 0); assert (rc >= 0);
bytes_read += rc; bytes_read += rc;
} }
assert (rc == 97);
// First two bytes are major and minor version numbers. // First two bytes are major and minor version numbers.
assert (buffer [0] == 3); // ZMTP/3.0 assert (buffer [0] == 3); // ZMTP/3.0

1
tools/curve_keygen.c
View File

@ -24,6 +24,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <assert.h>
#include <zmq_utils.h> #include <zmq_utils.h>
#ifdef HAVE_LIBSODIUM #ifdef HAVE_LIBSODIUM
# include <sodium.h> # include <sodium.h>