ChangeLogTag: Sun Aug 24 11:37:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

12 files changed, 239 insertions, 259 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0d447238276..0d18db77012 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Sun Aug 24 11:41:51 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/DynamicAny.cpp:
+        * tao/DynamicAny/DynamicAny.h:
+        * tao/DynamicAny/DynAny_i.h:
+        * tao/DynamicAny/DynAnyFactory.cpp:
+        * tao/DynamicAny/DynAnyFactory.h:
+        * tao/DynamicAny/DynArray_i.h:
+        * tao/DynamicAny/DynCommon.h:
+        * tao/DynamicAny/DynEnum_i.h:
+        * tao/DynamicAny/DynSequence_i.h:
+        * tao/DynamicAny/DynStruct_i.h:
+        * tao/DynamicAny/DynUnion_i.h:
+          Converted to doxygen format.
+
 Sat Aug 23 12:03:18 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h (setup_lanes):
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 99bc85390cb..032cdb79fb3 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -1,17 +1,14 @@
-// $Id$
-
-// =================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynAnyFactory.cpp
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// =================================================================
+
+//=============================================================================
+/**
+ *  @file    DynAnyFactory.cpp
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
 
 #include "DynAnyFactory.h"
 
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 752f9306e17..a3098445cf4 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -1,19 +1,16 @@
 /* -*- C++ -*- */
 
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO_DynamicAny
-//
-// = FILENAME
-//    DynAnyFactory.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// =========================================================================
+
+//=============================================================================
+/**
+ *  @file    DynAnyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNANYFACTORY_H
 #define TAO_DYNANYFACTORY_H
@@ -32,36 +29,38 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class TAO_DynAnyFactory
+ *
+ * Implements the DynamicAnyFactory interface and provides several
+ * utility functions shared by all the Dynamic Any components.
+ */
 class TAO_DynamicAny_Export TAO_DynAnyFactory
   : public virtual DynamicAny::DynAnyFactory,
     public virtual TAO_Local_RefCounted_Object
 {
-  // = DESCRIPTION
-  //   Implements the DynamicAnyFactory interface and provides several
-  //   utility functions shared by all the Dynamic Any components.
-  //
 public:
+  /// Constructor.
   TAO_DynAnyFactory (void);
-  // Constructor.
 
+  /// Obtain the kind of object, after all aliasing has been removed.
   static CORBA::TCKind unalias (CORBA::TypeCode_ptr tc
                                 ACE_ENV_ARG_DECL);
-  // Obtain the kind of object, after all aliasing has been removed.
 
+  /// Same as above, but returns type code instead of TCKind. Caller
+  /// must release the return value.
   static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc
                                           ACE_ENV_ARG_DECL);
-  // Same as above, but returns type code instead of TCKind. Caller
-  // must release the return value.
 
+  /// Create the correct type of DynAny object for <any>.
   static DynamicAny::DynAny_ptr
      make_dyn_any (const CORBA::Any &any
                    ACE_ENV_ARG_DECL);
-  // Create the correct type of DynAny object for <any>.
 
+  /// Create the correct type of DynAny object for <tc>
   static DynamicAny::DynAny_ptr
      make_dyn_any (CORBA::TypeCode_ptr tc
                    ACE_ENV_ARG_DECL);
-  // Create the correct type of DynAny object for <tc>
 
   // = The DynamicAnyFactory methods.
   virtual DynamicAny::DynAny_ptr create_dyn_any (
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 9e6c9041a75..4c28b822318 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO_DynamicAny
-//
-// = FILENAME
-//    DynAny_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// =========================================================================
+
+//=============================================================================
+/**
+ *  @file    DynAny_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNANY_I_H
 #define TAO_DYNANY_I_H
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 32cd7293d37..b11007edd4f 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===================================================================
-//
-// = LIBRARY
-//    TAO_DynamicAny
-//
-// = FILENAME
-//    DynArray_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ===================================================================
+
+//=============================================================================
+/**
+ *  @file    DynArray_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNARRAY_I_H
 #define TAO_DYNARRAY_I_H
@@ -34,31 +31,30 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class TAO_DynArray_i
+ *
+ * Implementation of Dynamic Any type for arrays
+ */
 class TAO_DynamicAny_Export TAO_DynArray_i
   : public virtual DynamicAny::DynArray,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
 {
-  // = TITLE
-  //    TAO_DynArray_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for arrays
-  //
 public:
+  /// Constructor.
   TAO_DynArray_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_DynArray_i (void);
-  // Destructor.
 
+  /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
-  // Initialize using just a TypeCode.
 
+  /// Initialize using an Any.
   void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
-  // Initialize using an Any.
 
   // = LocalObject methods
   static TAO_DynArray_i *_narrow (
@@ -146,14 +142,14 @@ public:
       ));
 
 private:
-  // Returns the type of elements contained in the array.
+  /// Returns the type of elements contained in the array.
   CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
-  // Gets the length of the array from the typecode.
+  /// Gets the length of the array from the typecode.
   CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc
                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  // Called by both versions of init().
+  /// Called by both versions of init().
   void init_common (void);
 
   // Use copy() or assign() instead of these.
@@ -161,8 +157,8 @@ private:
   TAO_DynArray_i &operator= (const TAO_DynArray_i &src);
 
 private:
+  /// Each component is also a DynAny.
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
-  // Each component is also a DynAny.
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index fdd6340ba26..bfb8837f29a 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO_DynamicAny
-//
-// = FILENAME
-//    DynCommon_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// =========================================================================
+
+//=============================================================================
+/**
+ *  @file    DynCommon_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNCOMMON_I_H
 #define TAO_DYNCOMMON_I_H
@@ -31,21 +28,21 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class TAO_DynCommon
+ *
+ * Contains most of the functionality common to all the
+ * Dynamic Any implementation classes.
+ */
 class TAO_DynamicAny_Export TAO_DynCommon
   : public virtual DynamicAny::DynAny
 {
-  // = TITLE
-  //    TAO_DynCommon
-  //
-  // = DESCRIPTION
-  //    Contains most of the functionality common to all the
-  //    Dynamic Any implementation classes.
 public:
+  /// Constructor.
   TAO_DynCommon (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~TAO_DynCommon (void);
-  // Destructor.
 
   // = Some functions common to all Dynamic Any types.
 
@@ -482,15 +479,15 @@ public:
       ));
 
 protected:
-  // This sets one of two flags in this base class. CORBA 2.4.2
-  // requires that destroy() do nothing if it is called on
-  // the result of current_component(), the only non-deep-copying
-  // method in the Dynamic Any API. If the boolean arg below is 0,
-  // the call is from inside current_component(), and the flag
-  // ref_to_component_ is set. If the boolean arg is 1, the call
-  // is from inside destroy(), and the container_is_destroying_
-  // flag is set, overriding the first flag in the component's
-  // destroy() method.
+  /// This sets one of two flags in this base class. CORBA 2.4.2
+  /// requires that destroy() do nothing if it is called on
+  /// the result of current_component(), the only non-deep-copying
+  /// method in the Dynamic Any API. If the boolean arg below is 0,
+  /// the call is from inside current_component(), and the flag
+  /// ref_to_component_ is set. If the boolean arg is 1, the call
+  /// is from inside destroy(), and the container_is_destroying_
+  /// flag is set, overriding the first flag in the component's
+  /// destroy() method.
   void set_flag (
       DynamicAny::DynAny_ptr component,
       CORBA::Boolean destroying
@@ -501,30 +498,30 @@ protected:
       ));
 
 protected:
+  /// Were we created by current_component()?
   CORBA::Boolean ref_to_component_;
-  // Were we created by current_component()?
 
+  /// Flag to let destroy() call by container override the flag above.
   CORBA::Boolean container_is_destroying_;
-  // Flag to let destroy() call by container override the flag above.
 
+  /// Do we contain other Dynamic Anys?
   CORBA::Boolean has_components_;
-  // Do we contain other Dynamic Anys?
 
+  /// Has destroy() been called on us yet?
   CORBA::Boolean destroyed_;
-  // Has destroy() been called on us yet?
 
+  /// Slot of the current component (if any).
   CORBA::Long current_position_;
-  // Slot of the current component (if any).
 
+  /// Number of components, as defined by CORBA 2.4.2.
   CORBA::ULong component_count_;
-  // Number of components, as defined by CORBA 2.4.2.
 
+  /// Holder for our type code.
   CORBA::TypeCode_var type_;
-  // Holder for our type code.
 
+  /// Gets a value only for basic types, but used in insert_*
+  /// and get_*, defined in this base class.
   CORBA::Any any_;
-  // Gets a value only for basic types, but used in insert_*
-  // and get_*, defined in this base class.
 
 private:
   // Utility functions used by insert_* and get_*.
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 3a08cfea1fa..d8bb9281ba2 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// =======================================================================
-//
-// = LIBRARY
-//    TAO_DynamicAny
-//
-// = FILENAME
-//    DynEnum_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ========================================================================
+
+//=============================================================================
+/**
+ *  @file    DynEnum_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNENUM_I_H
 #define TAO_DYNENUM_I_H
@@ -34,31 +31,30 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class TAO_DynEnum_i
+ *
+ * Implementation of Dynamic Any type for enums
+ */
 class TAO_DynamicAny_Export TAO_DynEnum_i
   : public virtual DynamicAny::DynEnum,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
 {
-  // = TITLE
-  //    TAO_DynEnum_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for enums
-  //
 public:
+  /// Constructor.
   TAO_DynEnum_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_DynEnum_i (void);
-  // Destructor.
 
+  /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
-  // Initialize using just a TypeCode.
 
+  /// Initialize using an Any.
   void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
-  // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynEnum_i *_narrow (
@@ -152,8 +148,8 @@ private:
   TAO_DynEnum_i &operator= (const TAO_DynEnum_i &src);
 
 private:
+  /// Current numeric value of the enum.
   CORBA::ULong value_;
-  // Current numeric value of the enum.
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index 2c6853e6531..4ceb1e02854 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ===================================================================
-//
-// = LIBRARY
-//    TAO_DynamicAny
-//
-// = FILENAME
-//    DynSequence_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ===================================================================
+
+//=============================================================================
+/**
+ *  @file    DynSequence_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNSEQUENCE_I_H
 #define TAO_DYNSEQUENCE_I_H
@@ -34,31 +31,30 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class TAO_DynSequence_i
+ *
+ * Implementation of Dynamic Any type for Sequences.
+ */
 class TAO_DynamicAny_Export TAO_DynSequence_i
   : public virtual DynamicAny::DynSequence,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
 {
-  // = TITLE
-  //    TAO_DynSequence_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for Sequences.
-  //
 public:
+  /// Constructor.
   TAO_DynSequence_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_DynSequence_i (void);
-  // Destructor.
 
+  /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
-  // Initialize using just a TypeCode.
 
+  /// Initialize using an Any.
   void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
-  // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynSequence_i *_narrow (
@@ -174,8 +170,8 @@ private:
   TAO_DynSequence_i &operator= (const TAO_DynSequence_i &src);
 
 private:
+  /// Each component is also a DynAny.
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
-  // Each component is also a DynAny.
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index ed8a1048e00..d78f6beb14b 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ========================================================================
-//
-// = LIBRARY
-//    TAO_DynamicAny
-//
-// = FILENAME
-//    DynStruct_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ========================================================================
+
+//=============================================================================
+/**
+ *  @file    DynStruct_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNSTRUCT_I_H
 #define TAO_DYNSTRUCT_I_H
@@ -34,31 +31,30 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class TAO_DynStruct_i
+ *
+ * Implementation of Dynamic Any type for Structs
+ */
 class TAO_DynamicAny_Export TAO_DynStruct_i
   : public virtual DynamicAny::DynStruct,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
 {
-  // = TITLE
-  //    TAO_DynStruct_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for Structs
-  //
 public:
+  /// Constructor.
   TAO_DynStruct_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_DynStruct_i (void);
-  // Destructor.
 
+  /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc
              ACE_ENV_ARG_DECL);
-  // Initialize using just a TypeCode.
 
+  /// Initialize using an Any.
   void init (const CORBA::Any& any
              ACE_ENV_ARG_DECL);
-  // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynStruct_i *_narrow (
@@ -164,16 +160,16 @@ public:
     ));
 
 private:
-  // Check if the typecode is acceptable.
+  /// Check if the typecode is acceptable.
   void check_typecode (CORBA::TypeCode_ptr tc
                        ACE_ENV_ARG_DECL);
 
-  // Code common to the constructor from an Any arg and the member
-  // function from_any().
+  /// Code common to the constructor from an Any arg and the member
+  /// function from_any().
   void set_from_any (const CORBA::Any &any
                      ACE_ENV_ARG_DECL);
 
-  // Called by both versions of init().
+  /// Called by both versions of init().
   void init_common (void);
 
   // = Use copy() or assign() instead of these.
@@ -181,8 +177,8 @@ private:
   TAO_DynStruct_i &operator= (const TAO_DynStruct_i &src);
 
 private:
+  /// Each component is also a DynAny.
   ACE_Array_Base<DynamicAny::DynAny_var> da_members_;
-  // Each component is also a DynAny.
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index 822485c1823..aa22ef008ca 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
-// $Id$
-
-// ========================================================================
-//
-// = LIBRARY
-//    TAO_DynamicAny
-//
-// = FILENAME
-//    DynUnion_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ========================================================================
+
+//=============================================================================
+/**
+ *  @file    DynUnion_i.h
+ *
+ *  $Id$
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNUNION_I_H
 #define TAO_DYNUNION_I_H
@@ -33,28 +30,28 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
+/**
+ * @class TAO_DynUnion_i
+ *
+ * Implementation of Dynamic Any type for Unions.
+ */
 class TAO_DynamicAny_Export TAO_DynUnion_i
   : public virtual DynamicAny::DynUnion,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
 {
-  // = TITLE
-  //    TAO_DynUnion_i
-  //
-  // = DESCRIPTION
-  //    Implementation of Dynamic Any type for Unions.
 public:
+  /// Constructor.
   TAO_DynUnion_i (void);
-  // Constructor.
 
+  /// Destructor.
   ~TAO_DynUnion_i (void);
-  // Destructor.
 
+  /// Constructor taking an Any argument.
   void init (const CORBA::Any& any ACE_ENV_ARG_DECL);
-  // Constructor taking an Any argument.
 
+  /// Constructor taking a typecode argument.
   void init (CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL);
-  // Constructor taking a typecode argument.
 
   // = LocalObject methods.
   static TAO_DynUnion_i *_narrow (
@@ -178,8 +175,8 @@ public:
       ));
 
 private:
-  // Code common to the constructor from an Any arg and the member
-  // function from_any().
+  /// Code common to the constructor from an Any arg and the member
+  /// function from_any().
   void set_from_any (const CORBA::Any &any,
                      CORBA::Boolean from_factory
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -189,10 +186,10 @@ private:
         DynamicAny::DynAnyFactory::InconsistentTypeCode
       ));
 
-  // Called by both versions of init().
+  /// Called by both versions of init().
   void init_common (void);
 
-  // Iterative check for label value match.
+  /// Iterative check for label value match.
   CORBA::Boolean label_match (const CORBA::Any &my_any,
                               const CORBA::Any &other_any
                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -200,16 +197,16 @@ private:
         CORBA::SystemException
       ));
 
-  // Use copy() or assign() instead of these.
+  /// Use copy() or assign() instead of these.
   TAO_DynUnion_i (const TAO_DynUnion_i &src);
   TAO_DynUnion_i &operator= (const TAO_DynUnion_i &src);
 
 private:
-  // Just two components.
+  /// Just two components.
   DynamicAny::DynAny_var member_;
   DynamicAny::DynAny_var discriminator_;
 
-  // The active member's slot in the union type code.
+  /// The active member's slot in the union type code.
   CORBA::ULong member_slot_;
 };
 
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 8a07d694722..6601550c40d 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -1,18 +1,15 @@
 /* -*- C++ -*- */
 
-// $Id$
-// =================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynamicAny.cpp
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// =================================================================
+//=============================================================================
+/**
+ *  @file    DynamicAny.cpp
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
 
 #include "DynamicAny.h"
 #include "DynAnyFactory.h"
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index 7057c644f90..c15a85f0035 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -1,19 +1,16 @@
 /* -*- C++ -*- */
 
-// $Id$
-
-// =========================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    DynamicAny.h
-//
-// = AUTHOR
-//    Carlos O'Ryan <coryan@uci.edu>
-//
-// =========================================================================
+
+//=============================================================================
+/**
+ *  @file    DynamicAny.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_DYNAMICANY_H
 #define TAO_DYNAMICANY_H
@@ -30,18 +27,18 @@
 class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader
 {
 public:
+  /// Constructor
   TAO_DynamicAny_Loader (void);
-  // Constructor
 
+  /// Creates a DynamicAny factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []
                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Creates a DynamicAny factory and returns it.
 
+  /// Used to force the initialization of the ORB code.
   static int Initializer (void);
-  // Used to force the initialization of the ORB code.
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader)