ChangeLogTag: Tue Mar 21 11:03:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 66 insertions, 62 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a859b7e7e3b..d1ec117b7c5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+
+        * tao/LocalObject.h:
+        * tao/IIOP_Acceptor.h:
+        * tao/IIOP_Acceptor.h:
+          Documentation and layout fixes
+
 Mon Mar 20 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/IIOP_Acceptor.cpp:
@@ -84,55 +90,55 @@ Thu Mar 16 12:20:41 MST 2006  Yan Dai  <dai_y@ociweb.com>
 
 Thu Mar 16 15:48:50 UTC 2006  jiang,shanshan <shanshan.jiang@vanderbilt.edu>
 
-        * TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
-        * TAO/TAO_IDL/util/utl_global.cpp
-        * TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
-        * TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
-        * TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
-        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
-        * TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
-        * TAO/orbsvcs/Notify_Service/Notify_Service.cpp
-        * TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
-        * TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
-        * TAO/orbsvcs/orbsvcs/AV/RTP.cpp
-        * TAO/orbsvcs/orbsvcs/AV/sfp.cpp
-        * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
-        * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
-        * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
-        * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
-        * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
-        * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
-        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
-        * TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
-        * TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
-        * TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
-        * TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
-        * TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
-        * TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
-        * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
-        * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
-        * TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
-        * TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
-        * TAO/tao/GIOP_Message_Base.cpp
-        * TAO/tao/GIOP_Message_Generator_Parser_10.cpp
-        * TAO/tao/GIOP_Message_Generator_Parser_12.cpp
-        * TAO/tao/GIOP_Message_Lite.cpp
-        * TAO/tao/IIOP_Acceptor.cpp
-        * TAO/tao/IIOP_Connection_Handler.cpp
-        * TAO/tao/ORB_Core.cpp
-        * TAO/tao/TAO_Internal.cpp
-        * TAO/tao/AnyTypeCode/Union_TypeCode.cpp
-        * TAO/tao/AnyTypeCode/append.cpp
-        * TAO/tao/AnyTypeCode/skip.cpp
-        * TAO/tao/PortableServer/POAManager.cpp
-        * TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
-        * TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp
-        * TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
-        * TAO/tao/RTCORBA/RT_ORB_Loader.cpp
-        * TAO/tao/Strategies/DIOP_Acceptor.cpp
-        * TAO/tao/Strategies/SHMIOP_Factory.cpp
-        * TAO/tao/Strategies/advanced_resource.cpp
-        * TAO/utils/catior/catior.cpp
+        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+        * TAO_IDL/util/utl_global.cpp
+        * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+        * orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+        * orbsvcs/ImplRepo_Service/INS_Locator.cpp
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+        * orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+        * orbsvcs/Notify_Service/Notify_Service.cpp
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+        * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+        * orbsvcs/orbsvcs/AV/RTP.cpp
+        * orbsvcs/orbsvcs/AV/sfp.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+        * tao/GIOP_Message_Base.cpp
+        * tao/GIOP_Message_Generator_Parser_10.cpp
+        * tao/GIOP_Message_Generator_Parser_12.cpp
+        * tao/GIOP_Message_Lite.cpp
+        * tao/IIOP_Acceptor.cpp
+        * tao/IIOP_Connection_Handler.cpp
+        * tao/ORB_Core.cpp
+        * tao/TAO_Internal.cpp
+        * tao/AnyTypeCode/Union_TypeCode.cpp
+        * tao/AnyTypeCode/append.cpp
+        * tao/AnyTypeCode/skip.cpp
+        * tao/PortableServer/POAManager.cpp
+        * tao/RTCORBA/Continuous_Priority_Mapping.cpp
+        * tao/RTCORBA/Linear_Priority_Mapping.cpp
+        * tao/RTCORBA/Multi_Priority_Mapping.cpp
+        * tao/RTCORBA/RT_ORB_Loader.cpp
+        * tao/Strategies/DIOP_Acceptor.cpp
+        * tao/Strategies/SHMIOP_Factory.cpp
+        * tao/Strategies/advanced_resource.cpp
+        * utils/catior/catior.cpp
           Updated these files to solve the warnings when setting up "VC level
           4 warnings" on Windows. These warnings include "unreachable code",
           "assignment within conditional expression", "conversion from some
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 6e22286cc95..96103c44a22 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -242,7 +242,7 @@ protected:
 
 private:
 
-  /// the concrete acceptor, as a pointer to it's base class.
+  /// The concrete acceptor, as a pointer to it's base class.
   BASE_ACCEPTOR base_acceptor_;
 
   /// Acceptor strategies.
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index de2269da01b..ebaabba991a 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -42,9 +42,6 @@ namespace CORBA
 
   /**
    * @class LocalObject
-   *
-   * @note NW: It is not clear whether minimum CORBA should support
-   * LocalObject or not.  I think it should.
    */
   class TAO_Export LocalObject : public virtual CORBA::Object
   {
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index c933c7d3a1d..89fce0721b5 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -62,7 +62,7 @@ class TAO_Queued_Data;
 /**
  * @class TAO_Pluggable_Messaging
  *
- * @brief Generic definitions  Messaging class.
+ * @brief Generic definitions Messaging class.
  *
  * This interface tries to define generic methods that could be
  * different messaging protocols
@@ -116,14 +116,14 @@ public:
                      CORBA::Octet minor) = 0;
 
   /// Parse the details of the next message from the @a incoming
-  /// and initializes attributes of @a qd. Returns 0 if the message 
-  /// header could not be parsed completely, returns a 1 if the message 
-  /// header could be parsed completely and returns -1 on error. As the 
+  /// and initializes attributes of @a qd. Returns 0 if the message
+  /// header could not be parsed completely, returns a 1 if the message
+  /// header could be parsed completely and returns -1 on error. As the
   /// parsed data is stored directly in @a qd, no state must be stored
   /// in instance of implementation.
   virtual int parse_next_message (ACE_Message_Block &incoming,
-                                  TAO_Queued_Data &qd,        /* out */ 
-                                  size_t &mesg_length) = 0;   /* out */ 
+                                  TAO_Queued_Data &qd,        /* out */
+                                  size_t &mesg_length) = 0;   /* out */
 
   /// Extract the details of the next message from the @a incoming
   /// through @a qd. Returns 0 if the message header could not be
@@ -132,7 +132,7 @@ public:
   virtual int extract_next_message (ACE_Message_Block &incoming,
                                     TAO_Queued_Data *&qd) = 0;
 
-  /// Check whether the node @a qd needs consolidation from @a incoming, 
+  /// Check whether the node @a qd needs consolidation from @a incoming,
   /// @r 0 on success, -1 on error
   virtual int consolidate_node (TAO_Queued_Data *qd,
                                 ACE_Message_Block &incoming) = 0;
@@ -172,7 +172,7 @@ public:
 
   /// Accessor for the output CDR stream
   virtual TAO_OutputCDR &out_stream (void) = 0;
-   
+
   /// Consolidate newly received fragment with previously arrived
   /// associated fragments to achieve consolidated message.  All
   /// fragments having been received previously are being managed
@@ -185,7 +185,8 @@ public:
   /// points to consolidated message, 1 if there are still fragmens
   /// outstanding, in case of error -1 is being returned. The
   /// implementation is responsible to release @a qd.
-  virtual int consolidate_fragmented_message (TAO_Queued_Data *qd, TAO_Queued_Data *&con_msg) = 0;
+  virtual int consolidate_fragmented_message (TAO_Queued_Data *qd,
+                                              TAO_Queued_Data *&con_msg) = 0;
 
   /// Discard all fragments associated to request-id encoded in
   /// cancel_request.  Transport implementaion guarantees that this