Merge pull request #516 from SRombauts/master

Corrected some more linking errors in MSVC build

builds/msvc/libzmq/libzmq.vcproj

@@ -402,6 +402,14 @@
 				RelativePath="..\..\..\src\random.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\raw_decoder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\raw_encoder.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\reaper.cpp"
 				>
@@ -692,6 +700,14 @@
 				RelativePath="..\..\..\src\random.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\raw_decoder.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\raw_encoder.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\reaper.hpp"
 				>

src/ctx.cpp

@@ -143,7 +143,7 @@ int zmq::ctx_t::set (int option_, int optval_)
     else
     if (option_ == ZMQ_IPV6 && optval_ >= 0) {
         opt_sync.lock ();
-        ipv6 = optval_;
+        ipv6 = (optval_ != 0);
         opt_sync.unlock ();
     }
     else {

src/options.cpp

@@ -185,7 +185,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
         /*  Deprecated in favor of ZMQ_IPV6  */
         case ZMQ_IPV4ONLY:
             if (is_int && (value == 0 || value == 1))
-                ipv6 = 1 - value;
+                ipv6 = (value == 0);
             else
                 valid = false;
             break;
@@ -193,7 +193,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
         /*  To replace the somewhat surprising IPV4ONLY */
         case ZMQ_IPV6:
             if (is_int && (value == 0 || value == 1))
-                ipv6 = value;
+                ipv6 = (value != 0);
             else
                 valid = false;
             break;

src/router.cpp

@@ -88,14 +88,14 @@ int zmq::router_t::xsetsockopt (int option_, const void *optval_,
         return -1;
     }
     if (option_ == ZMQ_ROUTER_RAW) {
-        raw_sock = *static_cast <const int*> (optval_);
+        raw_sock = (*static_cast <const int*> (optval_) != 0);
         if (raw_sock) {
             options.recv_identity = false;
             options.raw_sock = true;
         }
     }
     else
-        mandatory = *static_cast <const int*> (optval_);
+        mandatory = (*static_cast <const int*> (optval_) != 0);
     return 0;
 }
 

src/socket_base.cpp

@@ -135,7 +135,7 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_) :
     monitor_events (0)
 {
     options.socket_id = sid_;
-    options.ipv6 = parent_->get (ZMQ_IPV6);
+    options.ipv6 = (parent_->get (ZMQ_IPV6) != 0);
 }
 
 zmq::socket_base_t::~socket_base_t ()

src/xpub.cpp

@@ -98,7 +98,7 @@ int zmq::xpub_t::xsetsockopt (int option_, const void *optval_,
         errno = EINVAL;
         return -1;
     }
-    verbose = *static_cast <const int*> (optval_);
+    verbose = (*static_cast <const int*> (optval_) != 0);
     return 0;
 }