From 9d51155ce2019fc6ea2b486c33eee0d2754f723b Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Thu, 26 Sep 2013 11:33:44 +0200
Subject: [PATCH] Build/test errors on OS/X with clang++

---
 src/options.cpp       | 2 +-
 tests/test_stream.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/options.cpp b/src/options.cpp
index 84f36a7f..ea932b03 100644
--- a/src/options.cpp
+++ b/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;
             }
diff --git a/tests/test_stream.cpp b/tests/test_stream.cpp
index 2eaac50c..3e9a34e9 100644
--- a/tests/test_stream.cpp
+++ b/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