summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Koppanen <mkoppanen@php.net>2010-10-15 11:21:56 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-10-15 11:21:56 +0200
commit3e74a439c4b7901f3d3607a2d4142266bc1781b4 (patch)
treefd78e46af2246e19d7cadf3d0129d751dfe33f94
parentb64b50ae218dbbc362eaeb0571a337650f623e3c (diff)
Cast execute_timers() result to int
Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
-rw-r--r--src/devpoll.cpp2
-rw-r--r--src/epoll.cpp2
-rw-r--r--src/kqueue.cpp2
-rw-r--r--src/poll.cpp2
-rw-r--r--src/select.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/devpoll.cpp b/src/devpoll.cpp
index bfca042..fa6f484 100644
--- a/src/devpoll.cpp
+++ b/src/devpoll.cpp
@@ -150,7 +150,7 @@ void zmq::devpoll_t::loop ()
pending_list.clear ();
// Execute any due timers.
- uint64_t timeout = execute_timers ();
+ int timeout = (int) execute_timers ();
// Wait for events.
poll_req.dp_fds = &ev_buf [0];
diff --git a/src/epoll.cpp b/src/epoll.cpp
index ac0ffb1..fdaa74e 100644
--- a/src/epoll.cpp
+++ b/src/epoll.cpp
@@ -134,7 +134,7 @@ void zmq::epoll_t::loop ()
while (!stopping) {
// Execute any due timers.
- uint64_t timeout = execute_timers ();
+ int timeout = (int) execute_timers ();
// Wait for events.
int n = epoll_wait (epoll_fd, &ev_buf [0], max_io_events,
diff --git a/src/kqueue.cpp b/src/kqueue.cpp
index 965c5e9..15e1b48 100644
--- a/src/kqueue.cpp
+++ b/src/kqueue.cpp
@@ -147,7 +147,7 @@ void zmq::kqueue_t::loop ()
while (!stopping) {
// Execute any due timers.
- uint64_t timeout = execute_timers ();
+ int timeout = (int) execute_timers ();
// Wait for events.
struct kevent ev_buf [max_io_events];
diff --git a/src/poll.cpp b/src/poll.cpp
index 1cab5bb..af50793 100644
--- a/src/poll.cpp
+++ b/src/poll.cpp
@@ -124,7 +124,7 @@ void zmq::poll_t::loop ()
while (!stopping) {
// Execute any due timers.
- uint64_t timeout = execute_timers ();
+ int timeout = (int) execute_timers ();
// Wait for events.
int rc = poll (&pollset [0], pollset.size (), timeout ? timeout : -1);
diff --git a/src/select.cpp b/src/select.cpp
index 3a7cd81..c2497ca 100644
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -148,7 +148,7 @@ void zmq::select_t::loop ()
while (!stopping) {
// Execute any due timers.
- uint64_t timeout = execute_timers ();
+ int timeout = (int) execute_timers ();
// Intialise the pollsets.
memcpy (&readfds, &source_set_in, sizeof source_set_in);