ChangeLogTag:Tue Jun 12 11:07:18 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

3 files changed, 1 insertions, 11 deletions

diff --git a/examples/Timer_Queue/Reactor_Timer_Queue_Test.h b/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
index f80b067d8b1..4f85467339b 100644
--- a/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
+++ b/examples/Timer_Queue/Reactor_Timer_Queue_Test.h
@@ -69,7 +69,7 @@ public:
 
   int cancel_timer (void *argument);
   // Cancel a timer.  The (void *) will be mapped to the ID of the
-  // timer beiing cancelled.
+  // timer being cancelled.
 
   int list_timer (void *argument);
   // Dump the timers in the queue.  The argument is ignored.
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
index 0525f865d6d..66fe9763298 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
@@ -102,15 +102,6 @@ Handler::handle_timeout (const ACE_Time_Value &current_time,
   return 0;
 }
 
-// The handler was cancelled, so we must delete this.
-
-int
-Handler::cancelled (void)
-{
-  delete this;
-  return 0;
-}
-
 Input_Task::Input_Task (Thread_Timer_Queue *queue,
                         Thread_Timer_Queue_Test_Driver &timer_queue_driver)
   : ACE_Task_Base (ACE_Thread_Manager::instance ()),
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.h b/examples/Timer_Queue/Thread_Timer_Queue_Test.h
index 710b133b1e9..85d98f80371 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.h
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.h
@@ -140,7 +140,6 @@ public:
   virtual int handle_timeout (const ACE_Time_Value &current_time,
                               const void *arg);
   // Call back hook.
-  virtual int cancelled (void);
 
 private:
   ACE_Time_Value expires_;