Tue Apr 26 12:21:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * tao/Acceptor_Impl.h:
        * tao/Acceptor_Impl.cpp:
        * tao/Acceptor_Registry.h:
        * tao/Adapter_Registry.h:
        * tao/Bind_Dispatcher_Guard.h:
        * tao/Blocked_Connect_Strategy.h:
        * tao/Blocked_Connect_Strategy.cpp:
        * tao/Cleanup_Func_Registry.h:
        * tao/Collocated_Invocation.cpp:
        * tao/LF_Event_Loop_Thread_Helper.inl:
        * tao/LF_Follower_Auto_Adder.inl:
        * tao/Leader_Follower.cpp:
        * tao/Queued_Message.h:
        * tao/Transport_Cache_Manager_T.cpp:
        * tao/Wait_On_LF_No_Upcall.h:
        * tao/Wait_On_LF_No_Upcall.cpp:
        * tao/Wait_On_Reactor.h:
        * tao/Wait_On_Read.h:
          Doxygen changes

18 files changed, 34 insertions, 31 deletions

diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 76e7e32a3bc..0e6902e0620 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -112,9 +112,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
 
   // Registration with cache is successful, #REFCOUNT# is two at this
   // point.
-
-  TAO_Server_Strategy_Factory *f =
-    this->orb_core_->server_factory ();
+  TAO_Server_Strategy_Factory *f = this->orb_core_->server_factory ();
 
   int result = 0;
 
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index b7ed30357dd..38a2e55f7f8 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -70,8 +70,7 @@ public:
    * TAO_Server_Strategy_Factory, it activates the Svc_Handler to run
    * in its own thread.
    */
-  int activate_svc_handler (SVC_HANDLER *svc_handler,
-                            void *arg);
+  int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg);
 
 protected:
   /// Pointer to the ORB Core.
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index b452b97e811..b621bf4caef 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -55,7 +55,7 @@ typedef TAO_Acceptor** TAO_AcceptorSetIterator;
  * All loaded ESIOP or GIOP acceptor bridges must register with
  * this object.
  *
- * This class maintains a list os acceptor factories for all loaded ORB
+ * This class maintains a list of acceptor factories for all loaded ORB
  * protocols. There is one Acceptor_Registry per ORB_Core.
  */
 class TAO_Export TAO_Acceptor_Registry : private ACE_Copy_Disabled
diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h
index eb68a349613..93369c6f552 100644
--- a/TAO/tao/Adapter_Registry.h
+++ b/TAO/tao/Adapter_Registry.h
@@ -58,7 +58,7 @@ public:
   /**
    * Close each of of the Adapters and then cleanup the Registry.
    * It is possible that an Adapter will reject a close() call if it
-   * is invoked in an innapropriate context (think shutting down the
+   * is invoked in an inappropriate context (think shutting down the
    * POA while performing an upcall).
    */
   void close (int wait_for_completion);
diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h
index 24d31689905..6f19ed9f000 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.h
+++ b/TAO/tao/Bind_Dispatcher_Guard.h
@@ -33,7 +33,7 @@ public:
 
   ~TAO_Bind_Dispatcher_Guard (void);
 
-  /// Returns 0 if succesful and non-zero otherwise.
+  /// Returns 0 if successful and non-zero otherwise.
   int unbind_dispatcher (void);
 
   /// State information
diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp
index ecd5dc417b7..0807f9fd681 100644
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ b/TAO/tao/Blocked_Connect_Strategy.cpp
@@ -20,14 +20,12 @@ TAO_Blocked_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
   if (timeout != 0)
     {
       // Blocking with a timeout
-      options.set (ACE_Synch_Options::USE_TIMEOUT,
-                   *timeout);
+      options.set (ACE_Synch_Options::USE_TIMEOUT, *timeout);
     }
   else
     {
       // Making it sure it is blocking.
-      options.set (0,
-                   ACE_Time_Value::zero);
+      options.set (0, ACE_Time_Value::zero);
     }
 }
 
diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h
index 9e140e316ec..4e8ef1bd350 100644
--- a/TAO/tao/Blocked_Connect_Strategy.h
+++ b/TAO/tao/Blocked_Connect_Strategy.h
@@ -39,14 +39,12 @@ public:
    * Concrete implementation for this class. Please see
    * Connect_Strategy.h for details
    */
-  virtual void synch_options (ACE_Time_Value *val,
-                              ACE_Synch_Options &opt);
+  virtual void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt);
 
 protected:
   virtual int wait_i (TAO_LF_Event *ev,
                       TAO_Transport *t,
-                     ACE_Time_Value *val);
-
+                      ACE_Time_Value *val);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
index 351f9e05027..befc14c0d92 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -54,7 +54,7 @@ protected:
   /// Register a cleanup function.  The number of slot the cleanup
   /// function is placed is in will match the one reserved for the
   /// corresponding thread specific object in the ORB Core TSS
-  /// resources.  The slot_id is returned via the second reference
+  /// resources.  The @a slot_id is returned via the second reference
   /// argument.  This method returns 0 on failure, and -1 on failure.
   int register_cleanup_function (ACE_CLEANUP_FUNC func, size_t &slot_id);
 
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index 3ada6823af2..657dc7e38bc 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -97,7 +97,7 @@ namespace TAO
               }
           }
 
-        // Invocation completed succesfully
+        // Invocation completed successfully
         s = TAO_INVOKE_SUCCESS;
 
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
index 2fd8c6d98e7..a5c368dea38 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
@@ -19,7 +19,7 @@ TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper (
 ACE_INLINE
 TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void)
 {
-  int call_reset = (this->event_loop_return_ == 0);
+  int const call_reset = (this->event_loop_return_ == 0);
   this->lf_strategy_.reset_event_loop_thread (call_reset,
                                               this->leader_follower_);
 }
diff --git a/TAO/tao/LF_Follower_Auto_Adder.inl b/TAO/tao/LF_Follower_Auto_Adder.inl
index 0fa419366d0..17e3b69e291 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.inl
+++ b/TAO/tao/LF_Follower_Auto_Adder.inl
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index 8608e5f01af..9bf50ba6fa3 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -389,7 +389,6 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
       reactor->owner (ACE_Thread::self ());
 
       // Run the reactor event loop.
-
       if (TAO_debug_level >= 5)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) - Leader_Follower[%d]::wait_for_event,"
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
index 02924c5687f..51a73ab67e0 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -167,7 +167,7 @@ public:
    * message to update its state and determine if all the data has
    * been sent already.
    *
-   * @param byte_count The number of bytes succesfully sent.  The
+   * @param byte_count The number of bytes successfully sent.  The
    *                   TAO_Queued_Message should decrement this value
    *                   by the number of bytes that must still be sent.
    * @return Returns 1 if the TAO_Queued_Message has any more data to
diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp
index a48a5dafeff..00ba766b6e7 100644
--- a/TAO/tao/Transport_Cache_Manager_T.cpp
+++ b/TAO/tao/Transport_Cache_Manager_T.cpp
@@ -149,7 +149,7 @@ namespace TAO
             retval = this->cache_map_.bind (ext_id, int_id, entry);
             if (retval == 0)
               {
-                // The entry has been added to cache succesfully
+                // The entry has been added to cache successfully
                 // Add the cache_map_entry to the transport
                 int_id.transport ()->cache_map_entry (entry);
                 more_to_do = false;
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index e2342ed0733..7396c2d1e7a 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -69,7 +69,7 @@ namespace TAO
   //=================================================================
 
   Wait_On_LF_No_Upcall::Wait_On_LF_No_Upcall (TAO_Transport *t)
-    : base (t)
+    : TAO_Wait_On_Leader_Follower (t)
   {
   }
 
@@ -83,7 +83,7 @@ namespace TAO
   {
     Nested_Upcall_Guard upcall_guard (this->transport_);
 
-    return base::wait (max_wait_time, rd);
+    return TAO_Wait_On_Leader_Follower::wait (max_wait_time, rd);
   }
 
   bool
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index 59a3a1434a2..b058132529d 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -42,15 +42,17 @@ namespace TAO
   class Wait_On_LF_No_Upcall : public TAO_Wait_On_Leader_Follower
   {
   public:
-    typedef TAO_Wait_On_Leader_Follower base;
-
+     /// Constructor.
     explicit Wait_On_LF_No_Upcall (TAO_Transport *t);
 
+    /// Destructor.
     virtual ~Wait_On_LF_No_Upcall (void);
 
+    /*! @copydoc TAO_Wait_Strategy::wait() */
     virtual int wait (ACE_Time_Value *max_wait_time,
                       TAO_Synch_Reply_Dispatcher &rd);
 
+    /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
     virtual bool can_process_upcalls (void) const;
   };
 }
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index ad975429592..4fb8a40b936 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -39,12 +39,17 @@ public:
   /// Destructor.
   virtual ~TAO_Wait_On_Reactor (void);
 
-  // = Documented in TAO_Wait_Strategy.
-
+  /*! @copydoc TAO_Wait_Strategy::wait() */
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
+
+  /*! @copydoc TAO_Wait_Strategy::register_handler() */
   virtual int register_handler (void);
+
+  /*! @copydoc TAO_Wait_Strategy::non_blocking() */
   virtual bool non_blocking (void) const;
+
+  /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
   virtual bool can_process_upcalls (void) const;
 };
 
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index a5d83daa6fb..f5cd69e2652 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -38,12 +38,17 @@ public:
   /// Destructor.
   virtual ~TAO_Wait_On_Read (void);
 
-  // = Documented in TAO_Wait_Strategy.
-
+  /*! @copydoc TAO_Wait_Strategy::wait() */
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
+
+  /*! @copydoc TAO_Wait_Strategy::register_handler() */
   virtual int register_handler (void);
+
+  /*! @copydoc TAO_Wait_Strategy::non_blocking() */
   virtual bool non_blocking (void) const;
+
+  /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */
   virtual bool can_process_upcalls (void) const;
 };