*** empty log message ***

3 files changed, 22 insertions, 14 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index 81db797c89f..fcda474ed27 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,5 +1,11 @@
 Thu Jul 30 19:03:12 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
+	* examples/Timer_Queue/Thread_Timer_Queue_Test.h: Changed the type
+ 	  to class Thread_Timer_Queue_Test_Driver from
+ 	  Timer_Queue_Test_Driver <Thread_Timer_Queue, Input_Task,
+ 	  Input_Task::ACTION> to work around a bug with MSVC++.  Thanks to
+ 	  Gonzo for pointing this out.
+
 	* examples/Connection/blocking/SPIPE-{connector,acceptor}.cpp:
  	  Added #include "ace/Proactor.h".  Thanks to Gonzo for reporting
  	  this.
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
index e62107b7e78..d5f56e2d461 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
@@ -44,7 +44,7 @@ Handler::set_id (int id)
 
 int
 Handler::handle_timeout (const ACE_Time_Value &current_time,
-                        const void *)
+                         const void *)
 {
   ACE_Time_Value delay = current_time - this->expires_;
 
@@ -80,13 +80,15 @@ Input_Task::Input_Task (Thread_Timer_Queue *queue,
 {
 }
 
-// Svc method is called from the thread library to read input from  the user.
+// Svc method is called from the thread library to read input from the
+// user.
 
 int
 Input_Task::svc (void)
 {
   for (;;)
-    // call back to the driver's implementation on how to read and parse input.
+    // call back to the driver's implementation on how to read and
+    // parse input.
     if (this->driver_.get_next_request () == -1)
       break;
 
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.h b/examples/Timer_Queue/Thread_Timer_Queue_Test.h
index e6c8c3663f8..fa4c424ea79 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.h
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.h
@@ -12,7 +12,7 @@
 //
 // = DESCRIPTION
 //    This code exercises the <ACE_Thread_Timer_Queue_Adapter> using
-//    an <ACE_Timer_Heap_T>
+//    an <ACE_Timer_Heap_T>.
 //
 // = AUTHORS
 //    Carlos O'Ryan <coryan@cs.wustl.edu> and
@@ -43,10 +43,11 @@ typedef ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *,
 typedef ACE_Thread_Timer_Queue_Adapter<Timer_Heap>
         Thread_Timer_Queue;
 
-// Forward declaration
+// Forward declaration.
 class Thread_Timer_Queue_Test_Driver;
 
 class Input_Task : public ACE_Task_Base
+{
   // = TITLE
   //   Read user actions on the Timer_Queue from stdin.
   //
@@ -54,7 +55,6 @@ class Input_Task : public ACE_Task_Base
   //   This class reads user input from stdin; those commands permit
   //   the control of a Timer_Queue, which is dispatched by another
   //   thread.
-{
 public:
   typedef int (Input_Task::*ACTION) (void *);
 
@@ -88,21 +88,21 @@ private:
   const int usecs_;
   // How many micro seconds are in a second.
 
-  Timer_Queue_Test_Driver<Thread_Timer_Queue, Input_Task, Input_Task::ACTION> &driver_;
-  // The thread timer queue test driver
+  Thread_Timer_Queue_Test_Driver &driver_;
+  // The thread timer queue test driver.
 };
 
 class Thread_Timer_Queue_Test_Driver : public Timer_Queue_Test_Driver <Thread_Timer_Queue, Input_Task, Input_Task::ACTION>
+{
   // = TITLE
-  //    Implements an example application that exercises <Thread_Timer_Queue>
-  //    timer queue.
+  //    Implements an example application that exercises
+  //    <Thread_Timer_Queue> timer queue.
   //
   // = DESCRIPTION
   //    This class implements a simple test driver for the
   //    <Thread_Timer_Queue>.  The <display_menu> hook method is
   //    called from the base class to print a menu specific to the
   //    thread implementation of the timer queue.
-{
 public:
   Thread_Timer_Queue_Test_Driver (void);
   ~Thread_Timer_Queue_Test_Driver (void);
@@ -117,13 +117,13 @@ private:
 };
 
 class Handler : public ACE_Event_Handler
+{
   // = TITLE
   //     Event handler for the timer queue timeout events.
   //
   // = DESCRIPTION
-  //     The <handle_timeout> hook method prints out the current
-  //     time, prints the time when this timer expired and deletes "this".
-{
+  //     The <handle_timeout> hook method prints out the current time,
+  //     prints the time when this timer expired and deletes "this".
 public:
   Handler (const ACE_Time_Value &expiration_time);
   ~Handler (void);