ChangeLogTag: Tue Sep 24 06:29:45 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>

17 files changed, 103 insertions, 101 deletions

diff --git a/ace/ACE.h b/ace/ACE.h
index 1e81d958328..14fad8aae3a 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -190,8 +190,8 @@ public:
    * Accepts a variable, caller-specified, number of pointer/length
    * pairs. Arguments following @a n are char *, size_t pairs.
    *
-   * @arg handle  The I/O handle to receive on
-   * @arg n       The total number of char *, size_t pairs following @a n.
+   * @param handle The I/O handle to receive on
+   * @param n      The total number of char *, size_t pairs following @a n.
    *
    * @return -1 on error, else total number of bytes received.
    */
@@ -429,7 +429,7 @@ public:
    * Returns the current timestamp in the form
    * "hour:minute:second:microsecond."  The month, day, and year are
    * also stored in the beginning of the <date_and_time> array, which
-   * is a user-supplied array of size <time_len> <ACE_TCHAR>s.  Returns  
+   * is a user-supplied array of size <time_len> <ACE_TCHAR>s.  Returns
    * 0 if unsuccessful, else returns pointer to beginning of the
    * "time" portion of <date_and_time>.  If
    * <return_pointer_to_first_digit> is 0 then return a pointer to the
diff --git a/ace/Acceptor.h b/ace/Acceptor.h
index 8bf2598a73f..2c6f3da238e 100644
--- a/ace/Acceptor.h
+++ b/ace/Acceptor.h
@@ -92,31 +92,31 @@ public:
    * interval, the client can shutdown the connection, in which case,
    * the <accept> call can hang.
    *
-   * @arg local_addr   The address to listen at.
-   * @arg reactor      Pointer to the ACE_Reactor instance to register
+   * @param local_addr The address to listen at.
+   * @param reactor    Pointer to the ACE_Reactor instance to register
    *                   this object with. The default is the singleton.
-   * @arg flags        Flags to control what mode an accepted socket
+   * @param flags      Flags to control what mode an accepted socket
    *                   will be put into after it is accepted. The only
    *                   legal value for this argument is @c ACE_NONBLOCK,
    *                   which enables non-blocking mode on the accepted
    *                   peer stream object in @c SVC_HANDLER.  The default
    *                   is 0.
-   * @arg use_select   Affects behavior when called back by the reactor
+   * @param use_select Affects behavior when called back by the reactor
    *                   when a connection can be accepted.  If non-zero,
    *                   this object will accept all pending connections,
    *                   intead of just the one that triggered the reactor
    *                   callback.  Uses ACE_OS::select() internally to
    *                   detect any remaining acceptable connections.
    *                   The default is 1.
-   * @arg reuse_addr   Passed to the @c PEER_ACCEPTOR::open() method with
+   * @param reuse_addr Passed to the @c PEER_ACCEPTOR::open() method with
    *                   @p local_addr.  Generally used to request that the
    *                   OS allow reuse of the listen port.  The default is 1.
    *
    * @retval 0  Success
    * @retval -1 Failure, @c errno contains an error code.
    */
-  virtual int open (const ACE_PEER_ACCEPTOR_ADDR &,
-                    ACE_Reactor * = ACE_Reactor::instance (),
+  virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+                    ACE_Reactor *reactor = ACE_Reactor::instance (),
                     int flags = 0,
                     int use_select = 1,
                     int reuse_addr = 1);
@@ -305,8 +305,8 @@ public:
    * @retval 0  Success
    * @retval -1 Failure, @c errno contains an error code.
    */
-  virtual int open (const ACE_PEER_ACCEPTOR_ADDR &,
-                    ACE_Reactor *,
+  virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
+                    ACE_Reactor *reactor,
                     int flags = 0,
                     int use_select = 1,
                     int reuse_addr = 1);
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h
index 75011059365..b2c0cf6f383 100644
--- a/ace/Activation_Queue.h
+++ b/ace/Activation_Queue.h
@@ -50,23 +50,23 @@ public:
   /**
    * Initializes a new activation queue.
    *
-   * @arg new_queue  The activation queue uses an ACE_Message_Queue to
-   *                 queue and order the method requests. If this argument
-   *                 is 0, a new ACE_Message_Queue is created for this
-   *                 object's use and will be deleted when this object is
-   *                 destroyed. If a non-zero pointer is supplied, the
-   *                 passed object will be used and will not be deleted when
-   *                 this object is destroyed. If an ACE_Task is being created
-   *                 to act as the scheduler, for instance, its
-   *                 ACE_Message_Queue pointer can be passed to this object.
-   * @arg alloc      Optional, the allocator to use when allocating
-   *                 ACE_Message_Block instances that wrap the method requests
-   *                 queued to this activation queue. Defaults to
-   *                 ACE_Allocator::instance().
-   * @arg db_alloc   Optional, the allocator to use when allocating
-   *                 data blocks for the ACE_Message_Block instances that
-   *                 wrap the method requests queued to this activation queue.
-   *                 Defaults to ACE_Allocator::instance().
+   * @param new_queue The activation queue uses an ACE_Message_Queue to
+   *                  queue and order the method requests. If this argument
+   *                  is 0, a new ACE_Message_Queue is created for this
+   *                  object's use and will be deleted when this object is
+   *                  destroyed. If a non-zero pointer is supplied, the
+   *                  passed object will be used and will not be deleted when
+   *                  this object is destroyed. If an ACE_Task is being created
+   *                  to act as the scheduler, for instance, its
+   *                  ACE_Message_Queue pointer can be passed to this object.
+   * @param alloc     Optional, the allocator to use when allocating
+   *                  ACE_Message_Block instances that wrap the method requests
+   *                  queued to this activation queue. Defaults to
+   *                  ACE_Allocator::instance().
+   * @param db_alloc  Optional, the allocator to use when allocating
+   *                  data blocks for the ACE_Message_Block instances that
+   *                  wrap the method requests queued to this activation queue.
+   *                  Defaults to ACE_Allocator::instance().
    */
   ACE_Activation_Queue (ACE_Message_Queue<ACE_SYNCH> *new_queue = 0,
                         ACE_Allocator *alloc = 0,
@@ -79,7 +79,7 @@ public:
 
   /// Dequeue the next available ACE_Method_Request.
   /**
-   * @arg tv    If 0, the method will block until a method request is
+   * @param tv  If 0, the method will block until a method request is
    *            available, else will wait until the absolute time specified
    *            in the referenced ACE_Time_Value.  This method will return,
    *            earlier, however, if queue is closed, deactivated, or when
@@ -97,10 +97,10 @@ public:
    * method of the queued method request. Priority ordering is determined
    * by the ACE_Message_Queue class; 0 is the lowest priority.
    *
-   * @arg new_method_request  Pointer to the ACE_Method_Request object to
+   * @param new_method_request  Pointer to the ACE_Method_Request object to
    *            queue. This object's @c priority() method is called to obtain
    *            the priority.
-   * @arg tv    If 0, the method will block until the method request can
+   * @param tv  If 0, the method will block until the method request can
    *            be queued, else will wait until the absolute time specified
    *            in the referenced ACE_Time_Value.  This method will return,
    *            earlier, however, if queue is closed, deactivated, or when
diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h
index 6ab4b893b7a..44bb9266937 100644
--- a/ace/Arg_Shifter.h
+++ b/ace/Arg_Shifter.h
@@ -50,12 +50,12 @@ public:
    * forbidding iteration. Following iteration over @a argv, the
    * @a argc value will be updated to contain the number of
    * unconsumed arguments.
-   * @arg argc The number of strings in @a argv. @a argc will be
+   * @param argc The number of strings in @a argv. @a argc will be
    *    updated to reflect the number of unconsumed arguments.
-   * @arg argv The argument vector to shift. The string pointers in
+   * @param argv The argument vector to shift. The string pointers in
    *    the vector will be reordered to place the @a argc unconsumed
    *    arguments at the front of the vector.
-   * @arg temp A vector of @c ACE_TCHAR pointers at least @a argc
+   * @param temp A vector of @c ACE_TCHAR pointers at least @a argc
    *    elements long. The vector will be used for argument shifting as
    *    the specified @a argv vector is consumed. The vector must not
    *    be modified while this object exists. If this argument is 0
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index 26146446a6c..aadffaa11de 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -152,9 +152,9 @@ public:
    * from this method determines whether or not ACE will continue
    * opening the service or abort the connection.
    *
-   * @arg result    Result of the connection acceptance.
-   * @arg remote    Peer's address.
-   * @arg local     Local address connection was accepted at.
+   * @param result    Result of the connection acceptance.
+   * @param remote    Peer's address.
+   * @param local     Local address connection was accepted at.
    *
    * @retval  -1  ACE_Asynch_Acceptor will close the connection, and
    *              the service will not be opened.
diff --git a/ace/Asynch_Connector.h b/ace/Asynch_Connector.h
index 9b4acd67b51..eeb3c3f3818 100644
--- a/ace/Asynch_Connector.h
+++ b/ace/Asynch_Connector.h
@@ -57,7 +57,7 @@ public:
   virtual int open (int pass_addresses = 0,
                     ACE_Proactor *proactor = 0,
                     int validate_new_connection = 1);
-  
+
   /// This initiates a new asynchronous connect
   virtual int connect (const ACE_INET_Addr &remote_sap,
                        const ACE_INET_Addr &local_sap =
@@ -91,12 +91,12 @@ public:
    * desireable. The return value from this method determines whether or
    * not ACE will continue opening the service or abort the connection.
    *
-   * @arg result    Result of the connection acceptance. Use
+   * @param result  Result of the connection acceptance. Use
    *                result.success() to determine success or failure of
    *                the connection attempt.
-   * @arg remote    Peer's address. If the connection failed, this object
+   * @param remote  Peer's address. If the connection failed, this object
    *                is undefined.
-   * @arg local     Local address connection was completed from. If the
+   * @param local   Local address connection was completed from. If the
    *                connection failed, this object is undefined.
    *
    * @retval  -1  ACE_Asynch_Connector will close the connection, and
@@ -121,13 +121,13 @@ public:
   /// required.
   virtual int  validate_new_connection (void) const;
   virtual void validate_new_connection (int new_value);
-  
+
 protected:
 
   /// This is called when an outstanding accept completes.
   virtual void handle_connect (const ACE_Asynch_Connect::Result &result);
 
-  
+
   /// This parses the address from read buffer.
   void parse_address (const ACE_Asynch_Connect::Result &result,
                       ACE_INET_Addr &remote_address,
@@ -144,7 +144,7 @@ protected:
   virtual HANDLER *make_handler (void);
 
 private:
-  
+
   /// Asynch_Connect used to make life easier :-)
   ACE_Asynch_Connect asynch_connect_;
 
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index ead194c1881..0795493f8d0 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -191,7 +191,7 @@ ACE_OutputCDR::write_wchar (ACE_CDR::WChar x)
 
 ACE_CDR::Boolean
 ACE_OutputCDR::write_string (ACE_CDR::ULong len,
-                             const char *x)
+                             const ACE_CDR::Char *x)
 {
   // @@ This is a slight violation of "Optimize for the common case",
   // i.e. normally the translator will be 0, but OTOH the code is
diff --git a/ace/Future.h b/ace/Future.h
index 7848c5ba740..9855645e9a9 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -288,8 +288,8 @@ public:
   /**
    * Wait to get the object's value.
    *
-   * @arg value   Receives the value of this ACE_Future when it is set.
-   * @arg tv      Pointer to an ACE_Time_Value containing the absolute
+   * @param value Receives the value of this ACE_Future when it is set.
+   * @param tv    Pointer to an ACE_Time_Value containing the absolute
    *              time to wait until for the value to be set. If @a tv
    *              is 0, the call waits indefinitely for the value to be
    *              set, unless an error occurs.
@@ -322,6 +322,8 @@ public:
    * result is already set when this method gets invoked, then the update
    * method of the specified subject will be invoked immediately.
    *
+   * @param observer The observer to attach to the subject.
+   *
    * @retval  0   Success.
    * @retval  1   The observer was already attached.
    * @retval -1   Error; check ACE_OS::last_error() for an error code.
@@ -333,6 +335,8 @@ public:
    * The update method of the specified subject will not be invoked when the
    * ACE_Future_Rep result gets set.
    *
+   * @param observer The observer to attach to the subject.
+   *
    * @retval  0   The observer was successfully detached.
    * @retval -1   Error, including the observer not attached prior
    *              to calling this method.
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index 1513d1c76ad..a4558f2b447 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -46,7 +46,7 @@ public:
   enum
   {
    /**
-    * @arg REQUIRE_ORDER means that processing stops and @c EOF is
+    * REQUIRE_ORDER means that processing stops and @c EOF is
     * returned as soon as a non-option argument is found. @c opt_ind()
     * will return the index of the next @a argv element so the program
     * can continue processing the rest of the @a argv elements.
@@ -54,7 +54,7 @@ public:
     REQUIRE_ORDER = 1,
 
    /**
-    * @arg PERMUTE_ARGS means the @a argv elements are reordered dynamically
+    * PERMUTE_ARGS means the @a argv elements are reordered dynamically
     * (permuted) so that all options appear first. When the elements are
     * permuted, the order of the options and the following arguments are
     * maintained. When the last option has been processed, @c EOF is
@@ -64,7 +64,7 @@ public:
     PERMUTE_ARGS = 2,
 
    /**
-    * @arg RETURN_IN_ORDER means each @a argv element is processed in the
+    * RETURN_IN_ORDER means each @a argv element is processed in the
     * order is it seen.  If the element is not recognized as an option, '1'
     * is returned and @c opt_arg() refers to the @a argv element found.
     */
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 262402a07a3..841120c9c4b 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -247,7 +247,7 @@ public:
    * storing it in the <hostname> (which is assumed to be
    * <hostnamelen> bytes long).  This version is reentrant.  If
    * <hostnamelen> is greater than 0 then <hostname> will be
-   * NUL-terminated even if -1 is returned. 
+   * NUL-terminated even if -1 is returned.
    */
   int get_host_name (char hostname[],
                      size_t hostnamelen) const;
@@ -297,7 +297,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-  /// Insure that @arg hostname is properly null-terminated.
+  /// Insure that @a hostname is properly null-terminated.
   int get_host_name_i (char hostname[], size_t hostnamelen) const;
 
   // Methods to gain access to the actual address of
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 878f6ba6bac..3315618fee4 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -757,10 +757,10 @@ public:
   virtual ~ACE_Token_Proxy (void);
 
   /**
-   * Open the <ACE_Token>/
-   * @arg name The string uniquely identifying the token.
-   * @arg ignore_deadlock Can be 1 to disable deadlock notifications.
-   * @arg debug Prints debug messages.
+   * Open the <ACE_Token>.
+   * @param name The string uniquely identifying the token.
+   * @param ignore_deadlock Can be 1 to disable deadlock notifications.
+   * @param debug Prints debug messages.
    */
   virtual int open (const ACE_TCHAR *name,
                     int ignore_deadlock = 0,
@@ -969,9 +969,9 @@ class ACE_Export ACE_Local_Mutex : public ACE_Token_Proxy
 public:
   /**
    * Constructor.
-   * @arg token_name Uniquely id's the token.
-   * @arg ignore_deadlock Will allow deadlock to occur (useful for testing).
-   * @arg debug Prints a bunch of messages.
+   * @param token_name Uniquely id's the token.
+   * @param ignore_deadlock Will allow deadlock to occur (useful for testing).
+   * @param debug Prints a bunch of messages.
    */
   ACE_Local_Mutex (const ACE_TCHAR *token_name = 0,
                    int ignore_deadlock = 0,
@@ -1023,9 +1023,9 @@ public:
 
   /**
    * Constructor.
-   * @arg token_name Uniquely id's the token.
-   * @arg ignore_deadlock Will allow deadlock to occur (useful for testing).
-   * @arg debug Prints a bunch of messages.
+   * @param token_name Uniquely id's the token.
+   * @param ignore_deadlock Will allow deadlock to occur (useful for testing).
+   * @param debug Prints a bunch of messages.
    */
   ACE_Local_RLock (const ACE_TCHAR *token_name = 0,
                    int ignore_deadlock = 0,
@@ -1080,9 +1080,9 @@ public:
 
   /**
    * Constructor.
-   * @arg token_name Uniquely id's the token.
-   * @arg ignore_deadlock Will allow deadlock to occur (useful for testing).
-   * @arg debug Prints a bunch of messages.
+   * @param token_name Uniquely id's the token.
+   * @param ignore_deadlock Will allow deadlock to occur (useful for testing).
+   * @param debug Prints a bunch of messages.
    */
   ACE_Local_WLock (const ACE_TCHAR *token_name = 0,
                    int ignore_deadlock = 0,
diff --git a/ace/Map_T.i b/ace/Map_T.i
index b5c234a67d9..ff34ee8ae0a 100644
--- a/ace/Map_T.i
+++ b/ace/Map_T.i
@@ -818,7 +818,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::recover_key (const KEY
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::find (const KEY &key,
-                                                               ACE_Pair<KEY, VALUE> *&internal_value)
+                                                               expanded_value *&internal_value)
 {
   // Ask the <key_adapter_> to recover the active key.
   ACE_Active_Map_Manager_Key active_key;
@@ -929,7 +929,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::trybind (const KEY &,
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key,
-                                                                 ACE_Pair<KEY, VALUE> *&internal_value)
+                                                                 expanded_value *&internal_value)
 {
   // Ask the <key_adapter_> to recover the active key.
   ACE_Active_Map_Manager_Key active_key;
@@ -1002,7 +1002,7 @@ template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE ACE_Iterator_Imp
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::end_impl (void)
 {
   ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0;
-  ACE_NEW_RETURN (temp, 
+  ACE_NEW_RETURN (temp,
                   iterator_impl (this->implementation_.end ()),
                   0);
   return temp;
diff --git a/ace/Method_Request.h b/ace/Method_Request.h
index 1bd3d8be1f0..145b468566e 100644
--- a/ace/Method_Request.h
+++ b/ace/Method_Request.h
@@ -61,11 +61,11 @@ public:
    * method to order the method requests in the queue by priority.
    * 0 is the lowest priority.
    *
-   * @arg prio   unsigned long, the new priority value for this object.
+   * @param prio   unsigned long, the new priority value for this object.
    *
    * @sa ACE_Activation_Queue::enqueue
    */
-  void priority (unsigned long);
+  void priority (unsigned long prio);
 
   // = Invocation method (must be overridden by subclasses).
   /// Invoked by the scheduler to execute the request.
diff --git a/ace/POSIX_CB_Proactor.i b/ace/POSIX_CB_Proactor.i
index 6cc8655ddba..c27144ff75f 100644
--- a/ace/POSIX_CB_Proactor.i
+++ b/ace/POSIX_CB_Proactor.i
@@ -1,8 +1,12 @@
 /* -*- C++ -*- */
 // $Id$
 
-ACE_INLINE 
+#if defined (ACE_HAS_AIO_CALLS) && defined (__sgi)
+
+ACE_INLINE
 ACE_POSIX_Proactor::Proactor_Type ACE_POSIX_CB_Proactor::get_impl_type (void)
 {
   return PROACTOR_CB;
-} 
+}
+
+#endif /* ACE_HAS_AIO_CALLS && __sgi */
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index abe4dac5f3e..91b2faa2e0e 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -579,9 +579,9 @@ public:
   /**
    * Called to clean up when a thread exits.
    *
-   * @arg do_thread_exit   If non-0 then ACE_Thread::exit is called to
+   * @param do_thread_exit If non-0 then ACE_Thread::exit is called to
    *                       exit the thread
-   * @arg status           If ACE_Thread_Exit is called, this is passed as
+   * @param status         If ACE_Thread_Exit is called, this is passed as
    *                       the exit value of the thread.
    * Should _not_ be called by main thread.
    */
diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp
index ac303cca469..1b15b1c4658 100644
--- a/ace/Timer_Hash_T.cpp
+++ b/ace/Timer_Hash_T.cpp
@@ -52,9 +52,7 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Hash_Upcall (ACE_Timer
 // Calls up to timer_hash's upcall functor
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
-ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::timeout (ACE_Timer_Queue_T<ACE_Event_Handler *,
-                                                                       ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>,
-                                                                       ACE_Null_Mutex> &timer_queue,
+ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::timeout (TIMER_QUEUE &timer_queue,
                                                          ACE_Event_Handler *handler,
                                                          const void *arg,
                                                          const ACE_Time_Value &cur_time)
@@ -77,9 +75,7 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::timeout (ACE_Timer_Queue_T<ACE_E
 // Calls up to timer_hash's upcall functor
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
-ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::cancellation (ACE_Timer_Queue_T<ACE_Event_Handler *,
-                                                              ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>,
-                                                              ACE_Null_Mutex> &timer_queue,
+ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::cancellation (TIMER_QUEUE &timer_queue,
                                                               ACE_Event_Handler *handler)
 {
   ACE_UNUSED_ARG (timer_queue);
@@ -91,9 +87,7 @@ ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::cancellation (ACE_Timer_Queue_T<
 // Calls up to timer_hash's upcall functor
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
-ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::deletion (ACE_Timer_Queue_T<ACE_Event_Handler *,
-                                                          ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>,
-                                                          ACE_Null_Mutex> &timer_queue,
+ACE_Timer_Hash_Upcall<TYPE, FUNCTOR, ACE_LOCK>::deletion (TIMER_QUEUE &timer_queue,
                                                           ACE_Event_Handler *handler,
                                                           const void *arg)
 {
@@ -328,7 +322,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reschedule (ACE_Timer_Node_T<
   size_t position =
     expired->get_timer_value ().usec () % this->table_size_;
 
-  Hash_Token *h = ACE_reinterpret_cast (Hash_Token *, 
+  Hash_Token *h = ACE_reinterpret_cast (Hash_Token *,
                                         ACE_const_cast (void *,
                                                         expired->get_act ()));
 
@@ -338,7 +332,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reschedule (ACE_Timer_Node_T<
                                                   expired->get_interval ());
 
   if (this->table_[this->earliest_position_]->is_empty ()
-      || this->table_[position]->earliest_time () 
+      || this->table_[position]->earliest_time ()
       < this->table_[this->earliest_position_]->earliest_time ())
     this->earliest_position_ = position;
 }
@@ -359,7 +353,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type,
     future_time.usec () % this->table_size_;
 
   Hash_Token *h;
-  
+
   ACE_NEW_RETURN (h,
                   Hash_Token (act,
                               position,
@@ -372,7 +366,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type,
                                                   interval);
 
   if (this->table_[this->earliest_position_]->is_empty ()
-      || this->table_[position]->earliest_time () 
+      || this->table_[position]->earliest_time ()
       < this->table_[this->earliest_position_]->earliest_time ())
     this->earliest_position_ = position;
 
@@ -384,8 +378,8 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type,
 
 // Locate and update the inteval on the timer_id
 
-template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int 
-ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reset_interval (long timer_id, 
+template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
+ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::reset_interval (long timer_id,
                                                                    const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_Timer_Hash_T::reset_interval");
@@ -471,7 +465,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (const TYPE &type,
            !iter.isdone ();
            iter.next ())
         if (iter.item ()->get_type () == type)
-          timer_ids[pos++] = 
+          timer_ids[pos++] =
             ACE_reinterpret_cast (Hash_Token *,
                                   ACE_const_cast (void *,
                                                   iter.item ()->get_act ()));
@@ -492,7 +486,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (const TYPE &type,
   delete [] timer_ids;
 
   if (dont_call == 0)
-    this->upcall_functor ().cancellation (*this, 
+    this->upcall_functor ().cancellation (*this,
                                           type);
   this->find_new_earliest ();
 
diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h
index 3cdb6f14c22..f94dd04835d 100644
--- a/ace/WIN32_Asynch_IO.h
+++ b/ace/WIN32_Asynch_IO.h
@@ -689,7 +689,7 @@ public:
   /**
   * Same as above but with scatter support, through chaining of composite
   * message blocks using the continuation field.
-  * NOTE: Each data block payload must be at least the size of a system memory page 
+  * NOTE: Each data block payload must be at least the size of a system memory page
   * and must be aligned on a system memory page size boundary
   */
   int readv (ACE_Message_Block &message_block,
@@ -894,7 +894,7 @@ public:
   /**
   * Same as above but with gather support, through chaining of composite
   * message blocks using the continuation field.
-  * NOTE: Each data block payload must be at least the size of a system memory page 
+  * NOTE: Each data block payload must be at least the size of a system memory page
   * and must be aligned on a system memory page size boundary
   */
   int writev (ACE_Message_Block &message_block,
@@ -1251,7 +1251,7 @@ public:
   /**
    * Start an asynchronous connect.
    *
-   * @arg connect_handle   handle to use for the connect. If the value
+   * @param connect_handle Handle to use for the connect. If the value
    *                       ACE_INVALID_HANDLE, a new handle will be created.
    *
    * @retval 0  Success
@@ -1307,12 +1307,12 @@ private:
 
   /// Cancel uncompleted connect operations.
   /**
-   * @arg flg_notify  Indicates whether or not to send notification about
-   *                  canceled connect operations.  If 0, don't send
-   *                  notifications. If 1, notify user about canceled
-   *                  connects.
-   *                  According WIN32 standards we should receive
-   *                  notifications on canceled AIO requests.
+   * @param flg_notify Indicates whether or not to send notification about
+   *                   canceled connect operations.  If 0, don't send
+   *                   notifications. If 1, notify user about canceled
+   *                   connects.
+   *                   According WIN32 standards we should receive
+   *                   notifications on canceled AIO requests.
    */
   int cancel_uncompleted (int flg_notify, ACE_Handle_Set & set);