generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-15 07:14:49 +02:00
Code Issues Projects Releases Wiki Activity

Fixed 7 MSVC2008 Compiler Warning (level 3) C4800: 'const int' : forcing value to bool 'true' or 'false' (performance warning)

Browse Source 
- added explicit test "(xxx != 0)" to get a "bool" value out of the "int" expression
- see the MSDN recommandation http://msdn.microsoft.com/en-us/library/b6801kcy(v=vs.90).aspx
This commit is contained in:
Sébastien Rombauts
2013-02-19 14:18:50 +01:00
parent 42be4d13a7
commit 927000fe2f
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ctx.cpp
View File

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

4
src/options.cpp
View File

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

4
src/router.cpp
View File

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

2
src/socket_base.cpp
View File

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

2
src/xpub.cpp
View File

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