summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-06-20 08:11:48 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-06-20 08:11:48 +0200
commit8440de2b14876ecc6b39816528ef0793c6e34598 (patch)
tree601cbec8148e361461f1fd9fa483790739c1bf65
parentf4760f02c3ac966f858414fb50565faa5deb48bf (diff)
Fix minor warning in MSVC build
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--src/socket_base.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index dc6b5f5..16e3f0d 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -513,7 +513,7 @@ int zmq::socket_base_t::send (msg_t *msg_, int flags_)
if (unlikely (errno != EAGAIN))
return -1;
if (timeout > 0) {
- timeout = end - clock.now_ms ();
+ timeout = (int) (end - clock.now_ms ());
if (timeout <= 0) {
errno = EAGAIN;
return -1;
@@ -603,7 +603,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
return -1;
block = true;
if (timeout > 0) {
- timeout = end - clock.now_ms ();
+ timeout = (int) (end - clock.now_ms ());
if (timeout <= 0) {
errno = EAGAIN;
return -1;