Merge pull request #685 from hintjens/master

Build/test errors on OS/X with clang++

src/options.cpp

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

tests/test_stream.cpp

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

tools/curve_keygen.c

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