generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 18:55:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #607 from cjuniet/master

Browse Source 
[LIBZMQ-544] Fix compilation errors with Clang
This commit is contained in:
Pieter Hintjens 2013-07-03 15:43:09 -07:00
commit e093bd9923
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/options.cpp
View File

@ -264,7 +264,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0; return 0;
} }
else else
if (optvallen_ >= 0 && optvallen_ < 256 && optval_ != NULL) { if (optvallen_ > 0 && optvallen_ < 256 && optval_ != NULL) {
plain_username.assign ((const char *) optval_, optvallen_); plain_username.assign ((const char *) optval_, optvallen_);
as_server = 0; as_server = 0;
mechanism = ZMQ_PLAIN; mechanism = ZMQ_PLAIN;
@ -278,7 +278,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
return 0; return 0;
} }
else else
if (optvallen_ >= 0 && optvallen_ < 256 && optval_ != NULL) { if (optvallen_ > 0 && optvallen_ < 256 && optval_ != NULL) {
plain_password.assign ((const char *) optval_, optvallen_); plain_password.assign ((const char *) optval_, optvallen_);
as_server = 0; as_server = 0;
mechanism = ZMQ_PLAIN; mechanism = ZMQ_PLAIN;

2
src/z85_codec.hpp
View File

@ -105,4 +105,4 @@ Z85_decode (uint8_t *dest, char *string)
return dest; return dest;
} }
#endif #endif