summaryrefslogtreecommitdiff
path: root/src/devpoll.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-09-26 18:30:03 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-09-26 18:30:03 +0200
commitcf815e8c785254d97190f223765fbbd19a1e6d52 (patch)
tree5b76f6ad2d5e71eab8491957321834b7b5183e7b /src/devpoll.cpp
parentbe79a9fbc26a55c90b693485f69dfd17f710cb13 (diff)
new interfaces for timers; the implementation is not changed yet
Diffstat (limited to 'src/devpoll.cpp')
-rw-r--r--src/devpoll.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devpoll.cpp b/src/devpoll.cpp
index 003f465..7054c2b 100644
--- a/src/devpoll.cpp
+++ b/src/devpoll.cpp
@@ -128,12 +128,12 @@ void zmq::devpoll_t::reset_pollout (handle_t handle_)
devpoll_ctl (handle_, fd_table [handle_].events);
}
-void zmq::devpoll_t::add_timer (i_poll_events *events_)
+void zmq::devpoll_t::add_timer (int timeout_, i_poll_events *events_, int id_)
{
timers.push_back (events_);
}
-void zmq::devpoll_t::cancel_timer (i_poll_events *events_)
+void zmq::devpoll_t::cancel_timer (i_poll_events *events_, int id_)
{
timers_t::iterator it = std::find (timers.begin (), timers.end (), events_);
if (it != timers.end ())
@@ -190,7 +190,7 @@ void zmq::devpoll_t::loop ()
// Trigger all the timers.
for (timers_t::iterator it = t.begin (); it != t.end (); it ++)
- (*it)->timer_event ();
+ (*it)->timer_event (-1);
continue;
}