summaryrefslogtreecommitdiff
path: root/ace/Reactor.i
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-05-03 22:44:29 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-05-03 22:44:29 +0000
commit6fdc123c601a3f58942924c639757df366049743 (patch)
treef259a828748eac9e886983e3f9d3e44f0a0a8d1c /ace/Reactor.i
parent440ffb3f2559ea0ea76be0f1502f4d094fb7eeab (diff)
downloadATCD-6fdc123c601a3f58942924c639757df366049743.tar.gz
*** empty log message ***
Diffstat (limited to 'ace/Reactor.i')
-rw-r--r--ace/Reactor.i10
1 files changed, 5 insertions, 5 deletions
diff --git a/ace/Reactor.i b/ace/Reactor.i
index 8d3af9e94c3..2566aba6b3a 100644
--- a/ace/Reactor.i
+++ b/ace/Reactor.i
@@ -47,9 +47,8 @@ ACE_Reactor::remove_handler (int signum,
return this->signal_handler_->remove_handler (signum, new_disp, old_disp, sigkey);
}
-// The remaining methods in this file must be called with locks held
-
-// Note the queue handles its own locking.
+// = The remaining methods in this file must be called with locks
+// held. Note the queue handles its own locking.
ACE_INLINE int
ACE_Reactor::cancel_timer (ACE_Event_Handler *handler,
@@ -61,12 +60,13 @@ ACE_Reactor::cancel_timer (ACE_Event_Handler *handler,
}
ACE_INLINE int
-ACE_Reactor::cancel_timer (int timer_id,
+ACE_Reactor::cancel_timer (long timer_id,
const void **arg,
int dont_call_handle_close)
{
ACE_TRACE ("ACE_Reactor::cancel_timer");
- return this->timer_queue_->cancel (timer_id, arg,
+ return this->timer_queue_->cancel (timer_id,
+ arg,
dont_call_handle_close);
}