*** empty log message ***

1 files changed, 11 insertions, 5 deletions

diff --git a/ace/Timer_Heap.h b/ace/Timer_Heap.h
index 5b24e3dcc4e..b52d7b0fadd 100644
--- a/ace/Timer_Heap.h
+++ b/ace/Timer_Heap.h
@@ -99,18 +99,24 @@ public:
   // timer.  Returns -1 on failure (which is guaranteed never to be a
   // valid <timer_id>.
 
-  virtual int cancel (ACE_Event_Handler *event_handler);
+  virtual int cancel (ACE_Event_Handler *event_handler,
+		      int dont_call_handle_close = 1);
   // Cancel all <event_handlers> that match the address of
-  // <event_handler>.  Returns number of handler's cancelled.
+  // <event_handler>.  If <dont_call_handle_close> is 0 then the
+  // <handle_close> method of <event_handler> will be invoked.
+  // Returns number of handler's cancelled.
 
-  virtual int cancel (int timer_id, const void **arg = 0);
+  virtual int cancel (int timer_id, 
+		      const void **arg = 0,
+		      int dont_call_handle_close = 1);
   // Cancel the single <ACE_Event_Handler> that matches the <timer_id>
   // value (which was returned from the <schedule> method).  If arg is
   // non-NULL then it will be set to point to the ``magic cookie''
   // argument passed in when the <Event_Handler> was registered.  This
   // makes it possible to free up the memory and avoid memory leaks.
-  // Returns 1 if cancellation succeeded and 0 if the <timer_id>
-  // wasn't found.
+  // If <dont_call_handle_close> is 0 then the <handle_close> method
+  // of <event_handler> will be invoked.  Returns 1 if cancellation
+  // succeeded and 0 if the <timer_id> wasn't found.
 
   virtual void dump (void) const;
   // Dump the state of an object.