generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-24 07:21:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #633 from eburkitt/vs2012-clean-compile

Browse Source 
get to clean compile under vs2012
This commit is contained in:
Pieter Hintjens 2013-08-24 14:31:16 -07:00
commit 83e547f09f
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/msvc/libzmq/libzmq11.vcxproj
View File

@ -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" />

2
src/dealer.cpp
View File

@ -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;

2
src/mutex.hpp
View File

@ -52,7 +52,7 @@ namespace zmq
inline bool try_lock ()
{
return (bool) TryEnterCriticalSection (&cs);
return (TryEnterCriticalSection (&cs)) ? true : false;
}
inline void unlock ()

4
src/req.cpp
View File

@ -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;

6
src/router.cpp
View File

@ -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;