summaryrefslogtreecommitdiff
path: root/src/poll.cpp
diff options
context:
space:
mode:
authorMartin Lucina <mato@kotelna.sk>2010-09-08 15:25:45 +0200
committerMartin Lucina <martin@lucina.net>2012-01-23 08:53:27 +0100
commit90d73cba9cd1d1724f38ed82fc0eefb1781c9c20 (patch)
tree1760872164a93384d1adb90db9c8d41777dbb2a7 /src/poll.cpp
parentcf026feae205bfeb7e007f6afd0e8d7b283865c8 (diff)
parent5ba1cb20fe6f6699cef1cc726718e760cd4c9af1 (diff)
Imported Debian patch 2.0.9.dfsg-1debian/2.0.9.dfsg-1
Diffstat (limited to 'src/poll.cpp')
-rw-r--r--src/poll.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/poll.cpp b/src/poll.cpp
index 4214195..1b203db 100644
--- a/src/poll.cpp
+++ b/src/poll.cpp
@@ -165,22 +165,21 @@ void zmq::poll_t::loop ()
continue;
}
- for (pollset_t::iterator it = pollset.begin ();
- it != pollset.end (); it ++) {
+ for (pollset_t::size_type i = 0; i != pollset.size (); i++) {
- zmq_assert (!(it->revents & POLLNVAL));
- if (it->fd == retired_fd)
+ zmq_assert (!(pollset [i].revents & POLLNVAL));
+ if (pollset [i].fd == retired_fd)
continue;
- if (it->revents & (POLLERR | POLLHUP))
- fd_table [it->fd].events->in_event ();
- if (it->fd == retired_fd)
+ if (pollset [i].revents & (POLLERR | POLLHUP))
+ fd_table [pollset [i].fd].events->in_event ();
+ if (pollset [i].fd == retired_fd)
continue;
- if (it->revents & POLLOUT)
- fd_table [it->fd].events->out_event ();
- if (it->fd == retired_fd)
+ if (pollset [i].revents & POLLOUT)
+ fd_table [pollset [i].fd].events->out_event ();
+ if (pollset [i].fd == retired_fd)
continue;
- if (it->revents & POLLIN)
- fd_table [it->fd].events->in_event ();
+ if (pollset [i].revents & POLLIN)
+ fd_table [pollset [i].fd].events->in_event ();
}
// Clean up the pollset and update the fd_table accordingly.