Fri Mar 7 12:02:17 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Reactor_Token_T.cpp:
          Use copy constructor instead of assignment operator

        * ace/Timer_Hash_T.h:
        * ace/Timer_List_T.h:
        * ace/WFMO_Reactor.h:
          Doxygen improvements

        * ace/WFMO_Reactor.cpp:
        * ace/Timer_Heap_T.cpp:
          Layout changes

1 files changed, 4 insertions, 4 deletions

diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h
index 72958dc39f1..34a1e184815 100644
--- a/ACE/ace/Timer_List_T.h
+++ b/ACE/ace/Timer_List_T.h
@@ -127,8 +127,8 @@ public:
                               const ACE_Time_Value& interval);
 
   /**
-   * Cancel all timers associated with @a type.  If dont_call_handle_close is 0
-   * then the @a functor will be invoked.  Returns the number of timers
+   * Cancel all timers associated with @a type.  If @a dont_call_handle_close
+   * is 0 then the @a functor will be invoked.  Returns the number of timers
    * cancelled.
    */
   virtual int cancel (const TYPE& type,
@@ -176,8 +176,8 @@ private:
    * in as the value to the <functor>.  If @a interval is != to
    * ACE_Time_Value::zero then it is used to reschedule the @a type
    * automatically, using relative time to the current <gettimeofday>.
-   * This method returns a <timer_id> that uniquely identifies the the
-   * @a type entry in an internal list.  This <timer_id> can be used to
+   * This method returns a timer_id that uniquely identifies the the
+   * @a type entry in an internal list.  This timer_id can be used to
    * cancel the timer before it expires.  The cancellation ensures
    * that <timer_ids> are unique up to values of greater than 2
    * billion timers.  As long as timers don't stay around longer than