From aaa766acf7596eb4de7afe6ae0121335f4fd05da Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 16 Feb 2012 10:04:53 +0900 Subject: cancel_timer function renamed to rm_timer This is more consistent with adjacent add_fd and rm_fd functions. Signed-off-by: Martin Sustrik --- src/io_object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/io_object.cpp') diff --git a/src/io_object.cpp b/src/io_object.cpp index 8c4f2fe..730123e 100644 --- a/src/io_object.cpp +++ b/src/io_object.cpp @@ -87,9 +87,9 @@ void xs::io_object_t::add_timer (int timeout_, int id_) poller->add_timer (timeout_, this, id_); } -void xs::io_object_t::cancel_timer (int id_) +void xs::io_object_t::rm_timer (int id_) { - poller->cancel_timer (this, id_); + poller->rm_timer (this, id_); } void xs::io_object_t::in_event (fd_t fd_) -- cgit v1.2.3