diff options
| author | Martin Sustrik <sustrik@fastmq.com> | 2009-09-09 09:07:11 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@fastmq.com> | 2009-09-09 09:07:11 +0200 |
| commit | c99f39abc669084fd3a94675ee98e235448ad5a4 (patch) | |
| tree | 26480a694e81daceb6f3f97ec94147011c389e6d /src/devpoll.cpp | |
| parent | 37d8371967308ab1e541cf58b91e368b3e0b526c (diff) | |
| parent | cb78991f8e20fa35d99fa209be659c0aed59de47 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src/devpoll.cpp')
| -rw-r--r-- | src/devpoll.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/devpoll.cpp b/src/devpoll.cpp index b7d153c..ac5c72f 100644 --- a/src/devpoll.cpp +++ b/src/devpoll.cpp @@ -30,10 +30,12 @@ #include <fcntl.h> #include <unistd.h> #include <limits.h> +#include <algorithm> #include "devpoll.hpp" #include "err.hpp" #include "config.hpp" +#include "i_poll_events.hpp" zmq::devpoll_t::devpoll_t () { @@ -156,11 +158,11 @@ void zmq::devpoll_t::stop () stopping = true; } -bool zmq::devpoll_t::loop () +void zmq::devpoll_t::loop () { // According to the poll(7d) man page, we can retrieve // no more then (OPEN_MAX - 1) events. - int nfds = std::min (max_io_events, OPEN_MAX - 1); + int nfds = std::min ((int) max_io_events, OPEN_MAX - 1); while (!stopping) { |