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

        * tao/ORB_Core.cpp:
        * tao/Thread_Lane_Resources.h:
        * tao/Thread_Lane_Resources_Manager.h:
        * tao/Thread_Per_Connection_Handler.h:
        * tao/Transport.h:
        * tao/Transport_Connector.h:
        * tao/TypeCodeFactory_Adapter.h:
          Doxygen changes

7 files changed, 33 insertions, 26 deletions

diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 9034d79e62b..888ad88fcc7 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2257,9 +2257,10 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work)
   // wait only in the parent thread.
   if (this->has_shutdown () == true &&
       (this->server_factory_->activate_server_connections () ||
-       (this->tm_.task() == 0 && this->tm_.count_threads() > 0) ) ) {
-    this->tm_.wait ();
-  }
+       (this->tm_.task() == 0 && this->tm_.count_threads() > 0) ) )
+    {
+      this->tm_.wait ();
+    }
 
   if (TAO_debug_level > 10)
     {
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index f7c16239377..57a61f5d2fc 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -59,7 +59,7 @@ public:
   /// Destructor.
   ~TAO_Thread_Lane_Resources (void);
 
-  // Does @a mprofile belong to us?
+  /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Open the acceptor registry.
@@ -81,7 +81,7 @@ public:
 
   TAO_Acceptor_Registry &acceptor_registry (void);
 
-  /*
+  /**
    * @note Returning a pointer helps to return 0 in case of
    * exceptions.
    */
@@ -92,48 +92,57 @@ public:
 
   TAO_Leader_Follower &leader_follower (void);
 
-  /* Allocator is intended for allocating the ACE_Data_Blocks used in
+  /**
+   * Allocator is intended for allocating the ACE_Data_Blocks used in
    * incoming CDR streams.  This allocator has locks.
    */
   ACE_Allocator *input_cdr_dblock_allocator (void);
 
-  /* Allocator is intended for allocating the buffers in the incoming
+  /**
+   * Allocator is intended for allocating the buffers in the incoming
    * CDR streams.  This allocator has locks.
    */
   ACE_Allocator *input_cdr_buffer_allocator (void);
 
-  /* Allocator is intended for allocating the ACE_Message_Blocks used
+  /**
+   * Allocator is intended for allocating the ACE_Message_Blocks used
    * in incoming CDR streams.  This allocator is global, and has locks.
    */
   ACE_Allocator *input_cdr_msgblock_allocator (void);
 
-  /* Allocator is intended for allocating the buffers used in the
+  /**
+   * Allocator is intended for allocating the buffers used in the
    * Transport object. This allocator has locks.
    */
   ACE_Allocator *transport_message_buffer_allocator (void);
 
-  /* Allocator is intended for allocating the ACE_Data_Blocks used in
+  /**
+   * Allocator is intended for allocating the ACE_Data_Blocks used in
    * outgoing CDR streams.  This allocator has locks.
    */
   ACE_Allocator *output_cdr_dblock_allocator (void);
 
-  /* Allocator is intended for allocating the buffers in the outgoing
+  /**
+   * Allocator is intended for allocating the buffers in the outgoing
    * CDR streams.  This allocator has locks.
    */
   ACE_Allocator *output_cdr_buffer_allocator (void);
 
-  /* Allocator is intended for allocating the ACE_Message_Blocks used
+  /**
+   * Allocator is intended for allocating the ACE_Message_Blocks used
    * in the outgoing CDR streams.  This allocator is global, and has
    * locks.
    */
   ACE_Allocator *output_cdr_msgblock_allocator (void);
 
-  /* Allocator is intended for allocating the AMH response handlers
+  /**
+   * Allocator is intended for allocating the AMH response handlers
    * This allocator is global.
    */
   ACE_Allocator *amh_response_handler_allocator (void);
 
-  /* Allocator is intended for allocating the AMI response handlers
+  /**
+   * Allocator is intended for allocating the AMI response handlers
    * This allocator is global.
    */
   ACE_Allocator *ami_response_handler_allocator (void);
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index 152a4cd8774..4ef600836bf 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -95,7 +95,6 @@ class TAO_Export TAO_Thread_Lane_Resources_Manager_Factory
   : public ACE_Service_Object
 {
 public:
-
   /// Virtual destructor.
   virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void);
 
diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h
index 7e7f667062b..1947a111da8 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.h
+++ b/TAO/tao/Thread_Per_Connection_Handler.h
@@ -58,7 +58,7 @@ public:
   virtual int close (u_long);
 
 private:
-  /// Pointer to protocsol specific code that does the bunch of the
+  /// Pointer to protocol specific code that does the bunch of the
   /// job.
   TAO_Connection_Handler *ch_;
 };
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index ae4f0f8727e..5a768714b81 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -577,7 +577,7 @@ public:
    * following methods with the semantics documented below.
    */
   /**
-   * Initialising the messaging object. This would be used by the
+   * Initializing the messaging object. This would be used by the
    * connector side. On the acceptor side the connection handler
    * would take care of the messaging objects.
    */
@@ -603,7 +603,7 @@ public:
   virtual bool post_connect_hook (void);
 
   /// Memory management routines.
-  /*
+  /**
    * Forwards to event handler.
    */
   ACE_Event_Handler::Reference_Count add_reference (void);
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index de424ae503d..135ff7da51d 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -86,7 +86,7 @@ public:
   int make_mprofile (const char *ior, TAO_MProfile &mprofile);
 
   /// Helper function to assist corbaloc parsing. The default simply validates
-  /// the protocol identifyier and scans up to the next comma or slash.
+  /// the protocol identifier and scans up to the next comma or slash.
   /// Any protocol that has a specific need, such as uiop, can override this
   /// method to  provide a custom scanner.
   /// The profile returned is either null if this the ior does not match or an
@@ -108,7 +108,7 @@ public:
                                   TAO_Transport_Descriptor_Interface *desc,
                                   ACE_Time_Value *timeout);
 
-  /// A variation on connect that will try simultanious connections
+  /// A variation on connect that will try simultaneous connections
   /// on all endpoints listed in the desc.
   virtual TAO_Transport *parallel_connect (TAO::Profile_Transport_Resolver *r,
                                            TAO_Transport_Descriptor_Interface
@@ -129,7 +129,7 @@ public:
 
 protected:
   /// A flag indicating the actual connector supports parallel connection
-  /// attempts. The base implementation alwayse returns 0. Override to return
+  /// attempts. The base implementation always returns 0. Override to return
   /// non-zero if parallel connection attempts may be tried.
   virtual int supports_parallel_connects (void) const;
 
@@ -152,7 +152,7 @@ protected:
       TAO_Transport_Descriptor_Interface &desc,
       ACE_Time_Value *timeout);
 
-  /// Cancel the passed cvs handler from the connector
+  /// Cancel the passed @a svc_handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler *svc_handler) = 0;
 
   /// Check whether the connection is not closed
@@ -201,8 +201,8 @@ protected:
 
   /// Wait for a transport to be connected
   /// Note: no longer changes transport reference count
-  /// @ returns true if wait was uneventful
-  /// @         false if error occurred during wait
+  /// @retval true if wait was uneventful
+  /// @retval false if error occurred during wait
   bool wait_for_transport (TAO::Profile_Transport_Resolver *r,
                            TAO_Transport *base_transport,
                            ACE_Time_Value * timeout,
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index f356cc304a3..032e074dd65 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -157,8 +157,6 @@ public:
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members) = 0;
 
-  // --
-
   /**
    * @name TAO-specific TypeCode factory methods.
    *