ChangeLogTag: Mon May 16 15:13:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 39 insertions, 39 deletions

diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 876cc052c44..c1392e383a1 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -130,7 +130,7 @@ public:
   /// Destructor.
   ~TAO_OutputCDR (void);
 
-  // @@ TODO: do we want a special method to write an array of
+  // @todo do we want a special method to write an array of
   // strings and wstrings?
 
   // = TAO specific methods.
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
index 24da96db154..fbe3ea29044 100644
--- a/TAO/tao/Codeset_Manager.h
+++ b/TAO/tao/Codeset_Manager.h
@@ -53,22 +53,23 @@ class TAO_Codeset_Item
 {
 public:
   friend class TAO_Codeset_Manager;
-  /// creator method, the codeset name can only be set when the
+
+  /// Creator method, the codeset name can only be set when the
   /// object is created.
   TAO_Codeset_Item (const char *name);
 
-  /// destructor that deallocates the factory object if the
+  /// Destructor that deallocates the factory object if the
   /// CodeSet_Item retains ownership.
   ~TAO_Codeset_Item (void);
 
-  /// return a reference to the character representation of the codeset
+  /// Return a reference to the character representation of the codeset
   /// factories name.
   const char *codeset_name (void);
 
-  /// return a pointer to the codeset factory.
+  /// Return a pointer to the codeset factory.
   TAO_Codeset_Translator_Factory *factory (void);
 
-  /// set the factory pointer's value.
+  /// Set the factory pointer's value.
   void factory (TAO_Codeset_Translator_Factory *factory);
 
 private:
@@ -77,10 +78,10 @@ private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Codeset_Item&))
 
 private:
-  /// factory name.
+  /// Factory name.
   char *name_;
 
-  /// pointer to factory object.
+  /// Pointer to factory object.
   TAO_Codeset_Translator_Factory *factory_;
 };
 
@@ -119,7 +120,7 @@ public:
   ///  Called by an object of TAO_Acceptor to set NCS and CCS values for
   ///  Char/Wchar in to the Object Reference.
   void set_codeset (TAO_Tagged_Components& ) const;
-  ///
+
   /// Called from an object of "TAO_GIOP_Invocation" to set TCS on the
   /// Transport
   void set_tcs (TAO_Profile &theProfile, TAO_Transport &);
@@ -132,7 +133,6 @@ public:
   /// at this time Transport has the TCS for Char and WChar
   void generate_service_context (TAO_Operation_Details&, TAO_Transport & );
 
-
   /// Called by the resource factory to set the native char codeset id
   void set_ncs_c (CONV_FRAME::CodeSetId ncs);
 
@@ -159,59 +159,59 @@ public:
   void configure_codeset_factories();
 
 private:
-  // typedefs for containers containing the list of codesets
-  // factories for character and wide character.
+  /// Typedefs for containers containing the list of codesets
+  /// factories for character and wide character.
   typedef ACE_Unbounded_Set<TAO_Codeset_Item*>
           TAO_CodesetFactorySet;
 
-  // Iterators
+  /// Iterators
   typedef ACE_Unbounded_Set_Iterator<TAO_Codeset_Item*>
           TAO_CodesetFactorySetItor;
 
-  // Compute the TCS for Char/WChar asper the CORBA Specification
+  /// Compute the TCS for Char/WChar asper the CORBA Specification
   CONV_FRAME::CodeSetId computeTCS (CONV_FRAME::CodeSetComponent &,
                                     CONV_FRAME::CodeSetComponent &);
 
-  // Find CodesetId in the codeset component
+  /// Find CodesetId in the codeset component
   int isElementOf (CONV_FRAME::CodeSetId,
                    CONV_FRAME::CodeSetComponent & );
 
-  // find the intersection of CodesetIds between Client and Server CCS
+  /// Find the intersection of CodesetIds between Client and Server CCS
   CONV_FRAME::CodeSetId intersectionOf (CONV_FRAME::CodeSetComponent &,
                                         CONV_FRAME::CodeSetComponent &);
 
-  // determine compatibility between two codesets via the codeset registry
+  /// Determine compatibility between two codesets via the codeset registry
   int isCompatible (CONV_FRAME::CodeSetId,  CONV_FRAME::CodeSetId);
 
-  // traverse the list of codeset factories, populating the list of conversion
-  // codeset values with the translated codeset id from each factory that has
-  // a matching native codeset. Those factories that do not have a matching
-  // codeset are not retained in the list.
+  /// Traverse the list of codeset factories, populating the list of conversion
+  /// codeset values with the translated codeset id from each factory that has
+  /// a matching native codeset. Those factories that do not have a matching
+  /// codeset are not retained in the list.
   int init_codeset_factories_i (TAO_CodesetFactorySet&,
                                 CONV_FRAME::CodeSetComponent&);
 
-  // get the translator between our ncs_c and the supplied tcs_c
+  /// Get the translator between our ncs_c and the supplied tcs_c
   TAO_Codeset_Translator_Factory * get_char_trans (CONV_FRAME::CodeSetId);
 
-  // get the translator between our ncs_w and the supplied tcs_w
+  /// Get the translator between our ncs_w and the supplied tcs_w
   TAO_Codeset_Translator_Factory * get_wchar_trans (CONV_FRAME::CodeSetId);
 
   TAO_Codeset_Translator_Factory * get_translator_i (TAO_CodesetFactorySet&,
                                                      CONV_FRAME::CodeSetId);
 
-  // The CodeSetComponentInfo struct contains all of the information regarding
-  // the code sets this application recognizes. This is where the native code
-  // set for both char and wchar are stored.
+  /// The CodeSetComponentInfo struct contains all of the information regarding
+  /// the code sets this application recognizes. This is where the native code
+  /// set for both char and wchar are stored.
   CONV_FRAME::CodeSetComponentInfo codeset_info_;
 
-  // The lists of available translators for both chars and wchars.
+  /// The lists of available translators for both chars and wchars.
   TAO_CodesetFactorySet char_factories_;
   TAO_CodesetFactorySet wchar_factories_;
 
-  // The UTF16 BOM (Byte Order Marker) translator is unique in that it is
-  // required when UTF16 is used as both the native and transmitted codeset.
-  // It exists to insert or extract the BOM preceeding Wchar data in the
-  // stream.
+  /// The UTF16 BOM (Byte Order Marker) translator is unique in that it is
+  /// required when UTF16 is used as both the native and transmitted codeset.
+  /// It exists to insert or extract the BOM preceeding Wchar data in the
+  /// stream.
   TAO_Codeset_Translator_Factory *utf16_bom_translator_;
 
 };
diff --git a/TAO/tao/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset_Translator_Factory_T.h
index 658465917b1..b523a863e78 100644
--- a/TAO/tao/Codeset_Translator_Factory_T.h
+++ b/TAO/tao/Codeset_Translator_Factory_T.h
@@ -40,7 +40,7 @@ public:
   TAO_Codeset_Translator_Factory_T ();
   virtual ~TAO_Codeset_Translator_Factory_T ();
 
-  /// initialize the factory service object. Instantiates the translator.
+  /// Initialize the factory service object. Instantiates the translator.
   int init( int argc, ACE_TCHAR* argv[]);
 
   /// ncs returns the translator's native codeset ID.
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 7a81552dd38..63cd7683422 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -60,7 +60,7 @@ public:
 
   /**
    * Dispatch the reply. Return 1 on sucess, -1 on error.
-   * @@ TODO Pluggable Messaging:  this method has too many arguments,
+   * @todo Pluggable Messaging:  this method has too many arguments,
    *    the "Right Thing"[tm] is for the Transport Object to create a
    *    "ClientReply" that encapsulates all we need to process a
    *    reply.  Naturally it is possible that different messaging
@@ -72,7 +72,7 @@ public:
   /**
    * The used for the pending reply has been closed.
    * No reply is expected.
-   * @@ TODO: If the connection was closed due to a CloseConnection
+   * @todo If the connection was closed due to a CloseConnection
    *    message then we could re-issue the request instead of raising
    *    the exception, it would a matter of simply adding a boolean
    *    argument to this function.
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index 0ec96ff9a8d..2059d108820 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -112,11 +112,11 @@ public:
   // = The following two functions should be protected but we made it
   // public because it breaks some compilers.
 
-  TAO_Base_Sequence (const TAO_Base_Sequence &rhs);
-  TAO_Base_Sequence &operator= (const TAO_Base_Sequence &rhs);
   // Copy constructor and assignment operator are protected, the
   // derived classes must provided the right semantics for the buffer
   // copy, only the static fields are actually copy.
+  TAO_Base_Sequence (const TAO_Base_Sequence &rhs);
+  TAO_Base_Sequence &operator= (const TAO_Base_Sequence &rhs);
 
 protected:
 
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index 4084270704d..f05ef48e4be 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -109,7 +109,7 @@ public:
                               TAO_MProfile &mprofile,
                               CORBA::Short priority) = 0;
 
-  /// Return 1 if the <endpoint> has the same address as the acceptor.
+  /// Return 1 if the @a endpoint has the same address as the acceptor.
   virtual int is_collocated (const TAO_Endpoint* endpoint) = 0;
 
   /**
@@ -120,9 +120,9 @@ public:
   virtual CORBA::ULong endpoint_count (void) = 0;
 
   /**
-   * This method fetches the <key> from the <profile>. Protocols that
+   * This method fetches the @a key from the @a profile. Protocols that
    * are pluggable can send data that are specific in the
-   * <profile_data> field encapsulated as a octet stream. This method
+   * @c profile_data field encapsulated as a octet stream. This method
    * allows those  protocols to get the object key from the
    * encapsulation.
    */