From eaf227d4deb3bc43c5507f7b86d8c46ec4912b06 Mon Sep 17 00:00:00 2001
From: Evan Burkitt <evanb@edulinksys.com>
Date: Fri, 23 Aug 2013 17:14:03 -0700
Subject: [PATCH] get to clean compile under vs2012

Added some missing (but existing in branch) files to libzmq11 project needed
to compile as static library by VS2012 (at least), and fixed some warnings.
One warning remains in raw_decoder.cpp, which I'm leaving for now because I'm
not sure how project owners would like to fix it.
---
 builds/msvc/libzmq/libzmq11.vcxproj | 4 ++++
 src/dealer.cpp                      | 2 +-
 src/mutex.hpp                       | 2 +-
 src/req.cpp                         | 4 ++--
 src/router.cpp                      | 6 +++---
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/builds/msvc/libzmq/libzmq11.vcxproj b/builds/msvc/libzmq/libzmq11.vcxproj
index cfbcd6b5..153aa2f5 100644
--- a/builds/msvc/libzmq/libzmq11.vcxproj
+++ b/builds/msvc/libzmq/libzmq11.vcxproj
@@ -223,8 +223,10 @@
     <ClCompile Include="..\..\..\src\kqueue.cpp" />
     <ClCompile Include="..\..\..\src\lb.cpp" />
     <ClCompile Include="..\..\..\src\mailbox.cpp" />
+    <ClCompile Include="..\..\..\src\mechanism.cpp" />
     <ClCompile Include="..\..\..\src\msg.cpp" />
     <ClCompile Include="..\..\..\src\mtrie.cpp" />
+    <ClCompile Include="..\..\..\src\null_mechanism.cpp" />
     <ClCompile Include="..\..\..\src\object.cpp" />
     <ClCompile Include="..\..\..\src\options.cpp" />
     <ClCompile Include="..\..\..\src\own.cpp" />
@@ -233,6 +235,7 @@
     <ClCompile Include="..\..\..\src\pgm_sender.cpp" />
     <ClCompile Include="..\..\..\src\pgm_socket.cpp" />
     <ClCompile Include="..\..\..\src\pipe.cpp" />
+    <ClCompile Include="..\..\..\src\plain_mechanism.cpp" />
     <ClCompile Include="..\..\..\src\poll.cpp" />
     <ClCompile Include="..\..\..\src\poller_base.cpp" />
     <ClCompile Include="..\..\..\src\precompiled.cpp">
@@ -253,6 +256,7 @@
     <ClCompile Include="..\..\..\src\session_base.cpp" />
     <ClCompile Include="..\..\..\src\signaler.cpp" />
     <ClCompile Include="..\..\..\src\socket_base.cpp" />
+    <ClCompile Include="..\..\..\src\stream.cpp" />
     <ClCompile Include="..\..\..\src\stream_engine.cpp" />
     <ClCompile Include="..\..\..\src\sub.cpp" />
     <ClCompile Include="..\..\..\src\tcp.cpp" />
diff --git a/src/dealer.cpp b/src/dealer.cpp
index d69ed762..c56b1915 100644
--- a/src/dealer.cpp
+++ b/src/dealer.cpp
@@ -65,7 +65,7 @@ int zmq::dealer_t::xsetsockopt (int option_, const void *optval_,
     switch (option_) {
         case ZMQ_PROBE_ROUTER:
             if (is_int && value >= 0) {
-                probe_router = value;
+                probe_router = (value != 0);
                 return 0;
             }
             break;
diff --git a/src/mutex.hpp b/src/mutex.hpp
index 308f5eff..c72314df 100644
--- a/src/mutex.hpp
+++ b/src/mutex.hpp
@@ -52,7 +52,7 @@ namespace zmq
 
         inline bool try_lock ()
         {
-            return (bool) TryEnterCriticalSection (&cs);
+            return (TryEnterCriticalSection (&cs)) ? true : false;
         }
 
         inline void unlock ()
diff --git a/src/req.cpp b/src/req.cpp
index 8ab46ae1..554a918a 100644
--- a/src/req.cpp
+++ b/src/req.cpp
@@ -200,14 +200,14 @@ int zmq::req_t::xsetsockopt (int option_, const void *optval_, size_t optvallen_
     switch (option_) {
         case ZMQ_REQ_REQUEST_IDS:
             if (is_int && value >= 0) {
-                request_id_frames_enabled = value;
+                request_id_frames_enabled = (value != 0);
                 return 0;
             }
             break;
 
         case ZMQ_REQ_STRICT:
             if (is_int && value >= 0) {
-                strict = value;
+                strict = (value != 0);
                 return 0;
             }
             break;
diff --git a/src/router.cpp b/src/router.cpp
index b9001414..9b6b74aa 100644
--- a/src/router.cpp
+++ b/src/router.cpp
@@ -89,7 +89,7 @@ int zmq::router_t::xsetsockopt (int option_, const void *optval_,
     switch (option_) {
         case ZMQ_ROUTER_RAW:
             if (is_int && value >= 0) {
-                raw_sock = value;
+                raw_sock = (value != 0);
                 if (raw_sock) {
                     options.recv_identity = false;
                     options.raw_sock = true;
@@ -100,14 +100,14 @@ int zmq::router_t::xsetsockopt (int option_, const void *optval_,
 
         case ZMQ_ROUTER_MANDATORY:
             if (is_int && value >= 0) {
-                mandatory = value;
+                mandatory = (value != 0);
                 return 0;
             }
             break;
 
         case ZMQ_PROBE_ROUTER:
             if (is_int && value >= 0) {
-                probe_router = value;
+                probe_router = (value != 0);
                 return 0;
             }
             break;