Mon Mar 28 07:25:26 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/Deployment/Handlers/Homed_Component_Handler.cpp:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
        * performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h:
        * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc:
        * tools/IDL3_to_IDL2/basic_visitor.h:
        * tools/IDL3_to_IDL2/be_global.h:
        * tools/IDL3_to_IDL2/be_global.cpp:
        * tools/IDL3_to_IDL2/be_helper.h:
        * tools/IDL3_to_IDL2/be_helper.cpp:
        * tools/IDL3_to_IDL2/be_sunsoft.h:
        * tools/IDL3_to_IDL2/checking_visitor.h:
        * tools/IDL3_to_IDL2/identifier_helper.h:
        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h:
        * tools/IDL3_to_IDL2/idl3p_checking_visitor.h:
        * tools/IDL3_to_XMI/be_global.h:
        * tools/IDL3_to_XMI/be_global.cpp:
        * tools/IDL3_to_XMI/be_helper.cpp:
        * tools/IDL3_to_XMI/be_sunsoft.h:
        * tools/IDL3_to_XMI/identifier_helper.h:
          Converted to doxygen style

20 files changed, 339 insertions, 360 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 1f7d28ea4bd..372cb9aa205 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,26 @@
+Mon Mar 28 07:25:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment/Handlers/Homed_Component_Handler.cpp:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
+        * performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h:
+        * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc:
+        * tools/IDL3_to_IDL2/basic_visitor.h:
+        * tools/IDL3_to_IDL2/be_global.h:
+        * tools/IDL3_to_IDL2/be_global.cpp:
+        * tools/IDL3_to_IDL2/be_helper.h:
+        * tools/IDL3_to_IDL2/be_helper.cpp:
+        * tools/IDL3_to_IDL2/be_sunsoft.h:
+        * tools/IDL3_to_IDL2/checking_visitor.h:
+        * tools/IDL3_to_IDL2/identifier_helper.h:
+        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h:
+        * tools/IDL3_to_IDL2/idl3p_checking_visitor.h:
+        * tools/IDL3_to_XMI/be_global.h:
+        * tools/IDL3_to_XMI/be_global.cpp:
+        * tools/IDL3_to_XMI/be_helper.cpp:
+        * tools/IDL3_to_XMI/be_sunsoft.h:
+        * tools/IDL3_to_XMI/identifier_helper.h:
+          Converted to doxygen style
+
 Wed Mar 23 19:45:48 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * bin/generate_component_mpc.pl:
diff --git a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
index e7bcc9e47d5..4cd96ab38aa 100644
--- a/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
+++ b/CIAO/ciao/Deployment/Handlers/Homed_Component_Handler.cpp
@@ -108,7 +108,7 @@ namespace CIAO
     Components::CCMHome_var tmp_home = DEPLOYMENT_STATE::instance ()->fetch_home (tmp);
 
     Components::KeylessCCMHome_var home = Components::KeylessCCMHome::_narrow (tmp_home);
-    if (CORBA::is_nil (home))
+    if (::CORBA::is_nil (home.in ()))
       {
         CIAO_ERROR (1, (LM_ERROR, CLINFO
                         "Homed_Component_Handler_i::install_instance - "
@@ -132,8 +132,7 @@ namespace CIAO
         Deployment_Common::create_attribute_configuration (idd.configProperty,
                                                            attr_config);
 
-        container->set_attributes (ref.in (),
-                                   attr_config);
+        container->set_attributes (ref.in (), attr_config);
       }
     catch (const CORBA::Exception &ex)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
index 179f594e2c0..1b584c1a5a7 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
@@ -255,7 +255,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
     // this is very hard to test in a controlled environment.
     // When data arrives in DDS, the waiting ends and the
     // Getter starts to read the data. The number of samples
-    // read wil (almost) always be one.
+    // read will (almost) always be one.
     // On the other hand, when the user want to have all the
     // samples in DDS, one shouldn't use the wait method.
     // Since the spec is not clear about this, the test will
@@ -325,7 +325,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
                           fixed->time_out ().nanosec));
     GetterFixed gettertest_info;
     ::CCM_DDS::ReadInfo readinfo;
-    ACE_Time_Value tv = ACE_OS::gettimeofday ();
+    ACE_Time_Value const tv = ACE_OS::gettimeofday ();
     CORBA::Boolean const result = fixed->get_one (gettertest_info, readinfo);
     if (result)
       {
diff --git a/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h b/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h
index fac5d84a433..cfdcb226bee 100644
--- a/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h
+++ b/CIAO/performance-tests/Protocols/Sender/Custom_Network_Priority_Mapping.h
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Custom_Network_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares the Custom_Network_Priority_Mapping interface,
-//
-// = AUTHOR
-//   Yamuna Krishnamurthy (yamuna@oomworks.com)
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file   Custom_Network_Priority_Mapping.h
+ *
+ *  $Id$
+ *
+ * Declares the Custom_Network_Priority_Mapping interface,
+ *
+ *
+ *  @author Yamuna Krishnamurthy (yamuna@oomworks.com)
+ */
+//=============================================================================
+
 
 #ifndef CUSTOM_NETWORK_PRIORITY_MAPPING_H
 #define CUSTOM_NETWORK_PRIORITY_MAPPING_H
@@ -26,18 +23,18 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class Custom_Network_Priority_Mapping
+ *
+ * @brief A simple implementation of the Network_Priority_Mapping interface
+ *
+ * This implementation uses custom mapping between the range of
+ * priorities for a given scheduling class (ACE_SCHED_OTHER,
+ * ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
+ * priorities (0...32767)
+ */
 class Custom_Network_Priority_Mapping : public TAO_Network_Priority_Mapping
 {
-  //
-  // = TITLE
-  //   A simple implementation of the Network_Priority_Mapping interface
-  //
-  // = DESCRIPTION
-  //   This implementation uses custom mapping between the range of
-  //   priorities for a given scheduling class (ACE_SCHED_OTHER,
-  //   ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
-  //   priorities (0...32767)
-  //
 public:
   Custom_Network_Priority_Mapping (void);
 
diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
index 93a6e126560..967b800f810 100644
--- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
+++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(KitchenSink_idl_gen) : componentidldefaults, avoids_ccm_noevent {
+project(KitchenSink_idl_gen) : componentidldefaults {
   custom_only = 1
   idlflags += -Gex \
               -Wb,stub_export_macro=KITCHENSINK_STUB_Export \
@@ -17,7 +17,7 @@ project(KitchenSink_idl_gen) : componentidldefaults, avoids_ccm_noevent {
   }
 }
 
-project(KitchenSink_lem_gen) : ciaoidldefaults , avoids_ccm_noevent {
+project(KitchenSink_lem_gen) : ciaoidldefaults {
   after += KitchenSink_idl_gen
   custom_only = 1
   idlflags += -Wb,export_macro=KITCHENSINK_EXEC_Export \
@@ -29,7 +29,7 @@ project(KitchenSink_lem_gen) : ciaoidldefaults , avoids_ccm_noevent {
   }
 }
 
-project(KitchenSink_stub) : ccm_stub, avoids_ccm_noevent {
+project(KitchenSink_stub) : ccm_stub {
   after += KitchenSink_idl_gen
 
   sharedname = KitchenSink_stub
@@ -52,7 +52,7 @@ project(KitchenSink_stub) : ccm_stub, avoids_ccm_noevent {
   }
 }
 
-project(KitchenSink_exec) : ciao_executor, avoids_ccm_noevent {
+project(KitchenSink_exec) : ciao_executor {
   after   += KitchenSink_lem_gen KitchenSink_stub
   sharedname = KitchenSink_exec
   libs += KitchenSink_stub
@@ -78,7 +78,7 @@ project(KitchenSink_exec) : ciao_executor, avoids_ccm_noevent {
   }
 }
 
-project(KitchenSink_svnt) : ciao_servant, avoids_ccm_noevent {
+project(KitchenSink_svnt) : ciao_servant {
   after      += KitchenSink_exec
   sharedname  = KitchenSink_svnt
   libs       += KitchenSink_exec \
@@ -105,7 +105,7 @@ project(KitchenSink_svnt) : ciao_servant, avoids_ccm_noevent {
   }
 }
 
-project(KitchenSink_ConvertIDL3_Plus) : taoidl3toidl2defaults, avoids_ccm_noevent {
+project(KitchenSink_ConvertIDL3_Plus) : taoidl3toidl2defaults {
   custom_only = 1
 
   IDL3TOIDL2_Files {
@@ -113,32 +113,32 @@ project(KitchenSink_ConvertIDL3_Plus) : taoidl3toidl2defaults, avoids_ccm_noeven
   }
 }
 
-project(KitchenSink_IDL2_gen) : taoidldefaults, ccm_lw, avoids_ccm_noevent {
+project(KitchenSink_IDL2_gen) : taoidldefaults, ccm_lw {
   custom_only = 1
   idlflags += -Sm
   after += KitchenSink_ConvertIDL3_Plus
-  
+
   IDL_Files {
     KitchenSink_IDL2.idl
   }
 }
 
-project(KitchenSink_IDL2_skel) : ciao_executor, avoids_ccm_noevent{
+project(KitchenSink_IDL2_skel) : ciao_executor {
   after += KitchenSink_IDL2_gen
 
   IDL_Files {
   }
-  
+
   Source_Files {
     KitchenSink_IDL2C.cpp
     KitchenSink_IDL2S.cpp
   }
-  
+
   Header_Files {
     KitchenSink_IDL2C.h
     KitchenSink_IDL2S.h
   }
-  
+
   Inline_Files {
     KitchenSink_IDL2C.inl
     KitchenSink_IDL2S.inl
diff --git a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
index 5d442cb43a0..15478637c22 100644
--- a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
@@ -1,18 +1,17 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IDL3_TO_IDL2_BE_DLL
-//
-// = FILENAME
-//    basic_visitor.h
-//
-// = DESCRIPTION
-//    Base class for other visitors in this backend.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    basic_visitor.h
+ *
+ *  $Id$
+ *
+ *  Base class for other visitors in this backend.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef TAO_BASIC_VISITOR_H
 #define TAO_BASIC_VISITOR_H
diff --git a/CIAO/tools/IDL3_to_IDL2/be_global.cpp b/CIAO/tools/IDL3_to_IDL2/be_global.cpp
index 49291dea828..2b9b97a1387 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_global.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/be_global.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-//
-// = LIBRARY
-//    TAO_IDL3_TO_IDL2L_BE_DLL
-//
-// = FILENAME
-//    be_global.cpp
-//
-// = DESCRIPTION
-//    Stores global data specific to the compiler back end.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_global.cpp
+ *
+ *  $Id$
+ *
+ *  Stores global data specific to the compiler back end.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #include "be_global.h"
 #include "be_sunsoft.h"
diff --git a/CIAO/tools/IDL3_to_IDL2/be_global.h b/CIAO/tools/IDL3_to_IDL2/be_global.h
index b246164ce47..6efef349897 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_global.h
+++ b/CIAO/tools/IDL3_to_IDL2/be_global.h
@@ -1,21 +1,18 @@
 /* -*- c++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    be_global.h
-//
-// = DESCRIPTION
-//    Header file for class containing compiler back end global data.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_global.h
+ *
+ *  $Id$
+ *
+ *  Header file for class containing compiler back end global data.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_BE_GLOBAL_H
 #define TAO_IFR_BE_GLOBAL_H
@@ -42,11 +39,11 @@ public:
   // = DESCRIPTION
   //    Storage of global data specific to the compiler back end
   //
+  /// Constructor.
   BE_GlobalData (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~BE_GlobalData (void);
-  // Destructor.
 
   //=======================================
 
@@ -64,41 +61,45 @@ public:
 
   //=========================================
 
+  /// Parse args that affect this backend.
   virtual void parse_args (long &i, char **av);
-  // Parse args that affect this backend.
 
+  /// Create the output file, the associated stream, and
+  /// generate the initial #ifndef.
   int outfile_init (TAO_OutStream *&,
                     const char *file_prefix,
                     const char *file_suffix,
                     const char *guard_prefix,
                     const char *guard_suffix);
-  // Create the output file, the associated stream, and
-  // generate the initial #ifndef.
 
+  /// Cleanup.
   void destroy (void);
-  // Cleanup.
 
 protected:
+  /// So it can be turned off in backends that inherit from this one.
   bool gen_copyright_;
-  // So it can be turned off in backends that inherit from this one.
 
 private:
+  /// Name of the IDL file we are processing.
   char *filename_;
-  // Name of the IDL file we are processing.
 
+  /**
+   * Directory where the generated file is to be
+   * kept. Default value is 0 for this string which means the current
+   * directory from which the <tao_picml> is called.
+   */
   char *output_dir_;
-  // Directory where the generated file is to be
-  // kept. Default value is 0 for this string which means the current
-  // directory from which the <tao_picml> is called.
 
+  /// Have the generated file just include the original file if
+  /// no IDL3 declarations are found by the checking visitor.
   bool encapsulate_idl2_;
-  // Have the generated file just include the original file if
-  // no IDL3 declarations are found by the checking visitor.
 
+  /**
+   * Whitespace-separated list of included IDL files
+   * to be passed to the output IDL file without
+   * adding the '_IDL2" suffix.
+   */
   ACE_CString excluded_filenames_;
-  // Whitespace-separated list of included IDL files
-  // to be passed to the output IDL file without
-  // adding the '_IDL2" suffix.
 };
 
 #endif /* TAO_IFR_BE_GLOBAL_H */
diff --git a/CIAO/tools/IDL3_to_IDL2/be_helper.cpp b/CIAO/tools/IDL3_to_IDL2/be_helper.cpp
index 2d0d6079d91..aa3f151d1a8 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_helper.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/be_helper.cpp
@@ -1,23 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_helper.cpp
-//
-// = DESCRIPTION
-//   Provides helper classes to print generated code to the output
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-//    Improvements by Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_helper.cpp
+ *
+ *  $Id$
+ *
+ * Provides helper classes to print generated code to the output
+ *
+ *
+ *  @author Aniruddha Gokhale Improvements by Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "be_helper.h"
 #include "be_extern.h"
diff --git a/CIAO/tools/IDL3_to_IDL2/be_helper.h b/CIAO/tools/IDL3_to_IDL2/be_helper.h
index a28b60ec01d..1f85bf6cc89 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_helper.h
+++ b/CIAO/tools/IDL3_to_IDL2/be_helper.h
@@ -1,24 +1,19 @@
 /* -*- c++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_helper.h
-//
-// = DESCRIPTION
-//    Defines the abstract class for outputting the C++ mapping. This is a
-//    helper class to the singleton TAO_CodeGen class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-//    Improvements by Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_helper.h
+ *
+ *  $Id$
+ *
+ *  Defines the abstract class for outputting the C++ mapping. This is a
+ *  helper class to the singleton TAO_CodeGen class
+ *
+ *
+ *  @author Aniruddha Gokhale Improvements by Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #ifndef TAO_BE_OUTSTRM_H
 #define TAO_BE_OUTSTRM_H
@@ -73,50 +68,50 @@ extern TAO_IDL3_TO_IDL2_BE_Export const TAO_INDENT be_idt_nl;
 extern TAO_IDL3_TO_IDL2_BE_Export const TAO_UNINDENT be_uidt;
 extern TAO_IDL3_TO_IDL2_BE_Export const TAO_UNINDENT be_uidt_nl;
 
+/**
+ * @class TAO_OutStream
+ *
+ * Defines an interface by which the backend code generator can
+ * print its output to the underlying I/O handle. This is a
+ * helper class that will be used by the TAO_CodeGen
+ * class. However, this is an abstract class and classes that
+ * understand specific front ends must derive from this class.
+ */
 class TAO_IDL3_TO_IDL2_BE_Export TAO_OutStream
 {
-  // =TITLE
-  //   TAO_OutStream
-  //
-  // =DESCRIPTION
-  //    Defines an interface by which the backend code generator can
-  //    print its output to the underlying I/O handle. This is a
-  //    helper class that will be used by the TAO_CodeGen
-  //    class. However, this is an abstract class and classes that
-  //    understand specific front ends must derive from this class.
 public:
+  /// constructor.
   TAO_OutStream (void);
-  // constructor.
 
+  /// destructor.
   virtual ~TAO_OutStream (void);
-  // destructor.
 
+  /// open the underlying low-level handle for output.
   int open (const char *fname);
-  // open the underlying low-level handle for output.
 
 
+  /// Return the underlying lowlevel file pointer.
   FILE *file (void);
-  // Return the underlying lowlevel file pointer.
 
+  /// increment the indentation level and by default actually indent the output
+  /// accordingly
   int incr_indent (unsigned short flag = 1);
-  // increment the indentation level and by default actually indent the output
-  // accordingly
 
+  /// decrease the indentation level and by default actually indent the output
+  /// accordingly
   int decr_indent (unsigned short flag = 1);
-  // decrease the indentation level and by default actually indent the output
-  // accordingly
 
+  /// reset indentation level to 0
   int reset (void);
-  // reset indentation level to 0
 
+  /// indent starting next line
   int indent (void);
-  // indent starting next line
 
+  /// put a newline and indent on the next line
   int nl (void);
-  // put a newline and indent on the next line
 
+  /// "printf" style variable argument print
   int print (const char *format, ...);
-  // "printf" style variable argument print
 
   void gen_ifndef_string (const char *fname,
                           const char *prefix,
@@ -124,34 +119,34 @@ public:
 
   // =overloaded operators
 
+  /// output the char string and return a reference to ourselves
   TAO_OutStream &operator<< (const char *str);
-  // output the char string and return a reference to ourselves
 
+  /// output the integer and return a reference to ourselves
   TAO_OutStream &operator<< (const ACE_CDR::UShort num);
-  // output the integer and return a reference to ourselves
 
+  /// output the integer and return a reference to ourselves
   TAO_OutStream &operator<< (const ACE_CDR::Short num);
-  // output the integer and return a reference to ourselves
 
+  /// output the integer and return a reference to ourselves
   TAO_OutStream &operator<< (const ACE_CDR::ULong num);
-  // output the integer and return a reference to ourselves
 
+  /// output the integer and return a reference to ourselves
   TAO_OutStream &operator<< (const ACE_CDR::Long num);
-  // output the integer and return a reference to ourselves
 
 #if defined (ACE_WIN64)
+  /// output the integer and return a reference to ourselves
   TAO_OutStream &operator<< (const ACE_CDR::ULongLong num);
-  // output the integer and return a reference to ourselves
 
+  /// output the integer and return a reference to ourselves
   TAO_OutStream &operator<< (const ACE_CDR::LongLong num);
-  // output the integer and return a reference to ourselves
 #endif /* ACE_WIN64 */
 
+  /// output the integer and return a reference to ourselves
   TAO_OutStream &operator<< (const unsigned long num);
-  // output the integer and return a reference to ourselves
 
+  /// output the integer and return a reference to ourselves
   TAO_OutStream &operator<< (const long num);
-  // output the integer and return a reference to ourselves
 
   // = MANIPULATORS
 
@@ -170,11 +165,11 @@ public:
   virtual TAO_OutStream &print (AST_Expression *idl) = 0;
 
 protected:
+  /// The underlying low-level I/O handle.
   FILE *fp_;
-  // The underlying low-level I/O handle.
 
+  /// indentation level
   int indent_level_;
-  // indentation level
 };
 
 #endif // if !defined
diff --git a/CIAO/tools/IDL3_to_IDL2/be_sunsoft.h b/CIAO/tools/IDL3_to_IDL2/be_sunsoft.h
index c269c8c3bc8..689c9a7ed35 100644
--- a/CIAO/tools/IDL3_to_IDL2/be_sunsoft.h
+++ b/CIAO/tools/IDL3_to_IDL2/be_sunsoft.h
@@ -1,45 +1,43 @@
 /* -*- c++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_sunsoft.h
-//
-// = DESCRIPTION
-//    SunSoft specific backend output generation
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_sunsoft.h
+ *
+ *  $Id$
+ *
+ *  SunSoft specific backend output generation
+ *
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
 
 #ifndef TAO_BE_HELPER_H
 #define TAO_BE_HELPER_H
 
 #include "be_helper.h"
 
+/**
+ * @class TAO_SunSoft_OutStream
+ *
+ * Backend specific to SunSoft AST nodes
+ */
 class TAO_IDL3_TO_IDL2_BE_Export TAO_SunSoft_OutStream : public TAO_OutStream
 {
-  // =TITLE
-  //  TAO_SunSoft_OutStream
-  // =DESCRIPTION
-  //  Backend specific to SunSoft AST nodes
 public:
+  /// constructor
   TAO_SunSoft_OutStream (void);
-  // constructor
 
+  /// destuctor
   ~TAO_SunSoft_OutStream (void);
-  // destuctor
 
+  /// output the SunSoft IDL Identifier Node
   virtual TAO_OutStream &print (Identifier *id);
-  // output the SunSoft IDL Identifier Node
 
+  /// output the contents of the AST_Expression node
   virtual TAO_OutStream &print (AST_Expression *expr);
-  // output the contents of the AST_Expression node
 };
 
 #endif // if !defined
diff --git a/CIAO/tools/IDL3_to_IDL2/checking_visitor.h b/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
index a6f8f1bb7f0..66837cbf450 100644
--- a/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IDL3_TO_IDL2_BE_DLL
-//
-// = FILENAME
-//    checking_visitor.h
-//
-// = DESCRIPTION
-//    Visitor that checks input IDL3 in a separate pass.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    checking_visitor.h
+ *
+ *  $Id$
+ *
+ *  Visitor that checks input IDL3 in a separate pass.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IDL_CHECKING_VISITOR_H
 #define TAO_IDL_CHECKING_VISITOR_H
@@ -33,16 +30,16 @@
 
 class UTL_ExceptList;
 
+/**
+ * @class checking_visitor
+ *
+ * @brief checking_visitor.
+ *
+ * Checks input IDL3 and sets flags used by subsequent
+ * equivalent IDL generating visitor.
+ */
 class TAO_IDL3_TO_IDL2_BE_Export checking_visitor : public ast_visitor
 {
-  //
-  // = TITLE
-  //    checking_visitor.
-  //
-  // = DESCRIPTION
-  //    Checks input IDL3 and sets flags used by subsequent
-  //    equivalent IDL generating visitor.
-  //
 public:
   checking_visitor (void);
   virtual ~checking_visitor (void);
diff --git a/CIAO/tools/IDL3_to_IDL2/identifier_helper.h b/CIAO/tools/IDL3_to_IDL2/identifier_helper.h
index ff318b8fd7b..61b2689e3a9 100644
--- a/CIAO/tools/IDL3_to_IDL2/identifier_helper.h
+++ b/CIAO/tools/IDL3_to_IDL2/identifier_helper.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IDL3_TO_IDL2_BE_DLL
-//
-// = FILENAME
-//    identifier_helper.h
-//
-// = DESCRIPTION
-//    Utilities associated with UTL_Identifier.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    identifier_helper.h
+ *
+ *  $Id$
+ *
+ *  Utilities associated with UTL_Identifier.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDENTIFIER_HELPER_H
 #define IDENTIFIER_HELPER_H
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
index e2198e7ceb3..44db66adfd1 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IDL3_TO_IDL2_BE_DLL
-//
-// = FILENAME
-//    idl3_to_idl2_visitor.h
-//
-// = DESCRIPTION
-//    Generates equivalent IDL2 from IDL3.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    idl3_to_idl2_visitor.h
+ *
+ *  $Id$
+ *
+ *  Generates equivalent IDL2 from IDL3.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IDL3_TO_IDL2_VISITOR_H
 #define TAO_IDL3_TO_IDL2_VISITOR_H
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h
index d513df7b996..371c90192d6 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/idl3p_checking_visitor.h
@@ -1,21 +1,20 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IDL3_TO_IDL2_BE_DLL
-//
-// = FILENAME
-//    idl3p_checking_visitor.h
-//
-// = DESCRIPTION
-//    Header file for visitor that checks modules for the
-//    presence of declarations other than non-code-generating
-//    IDL3+ constructs. Prevents the generation of illegal
-//    empty modules in the *_IDL2 artifact.
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    idl3p_checking_visitor.h
+ *
+ *  $Id$
+ *
+ *  Header file for visitor that checks modules for the
+ *  presence of declarations other than non-code-generating
+ *  IDL3+ constructs. Prevents the generation of illegal
+ *  empty modules in the *_IDL2 artifact.
+ *
+ *
+ */
+//=============================================================================
+
 
 #ifndef TAO_IDL3P_CHECKING_VISITOR_H
 #define TAO_IDL3P_CHECKING_VISITOR_H
diff --git a/CIAO/tools/IDL3_to_XMI/be_global.cpp b/CIAO/tools/IDL3_to_XMI/be_global.cpp
index 7c2d291ab92..7670a374215 100644
--- a/CIAO/tools/IDL3_to_XMI/be_global.cpp
+++ b/CIAO/tools/IDL3_to_XMI/be_global.cpp
@@ -1,21 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-//
-// = LIBRARY
-//    TAO_IDL3_TO_IDL2L_BE_DLL
-//
-// = FILENAME
-//    be_global.cpp
-//
-// = DESCRIPTION
-//    Stores global data specific to the compiler back end.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_global.cpp
+ *
+ *  $Id$
+ *
+ *  Stores global data specific to the compiler back end.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #include "be_global.h"
 #include "ast_generator.h"
diff --git a/CIAO/tools/IDL3_to_XMI/be_global.h b/CIAO/tools/IDL3_to_XMI/be_global.h
index 3a52ae32b78..c5d133b5c4b 100644
--- a/CIAO/tools/IDL3_to_XMI/be_global.h
+++ b/CIAO/tools/IDL3_to_XMI/be_global.h
@@ -1,21 +1,18 @@
 /* -*- c++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IFR_BE_DLL
-//
-// = FILENAME
-//    be_global.h
-//
-// = DESCRIPTION
-//    Header file for class containing compiler back end global data.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_global.h
+ *
+ *  $Id$
+ *
+ *  Header file for class containing compiler back end global data.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_IFR_BE_GLOBAL_H
 #define TAO_IFR_BE_GLOBAL_H
@@ -40,11 +37,11 @@ public:
   // = DESCRIPTION
   //    Storage of global data specific to the compiler back end
   //
+  /// Constructor.
   BE_GlobalData (void);
-  // Constructor.
 
+  /// Destructor.
   virtual ~BE_GlobalData (void);
-  // Destructor.
 
   // Data accessors.
   bool ir_filter (void) const;
@@ -62,22 +59,24 @@ public:
   bool local_only (void) const;
   void local_only (bool);
 
+  /// Parse args that affect the backend.
   void parse_args (long &i, char **av);
-  // Parse args that affect the backend.
 
+  /// Cleanup.
   void destroy (void);
-  // Cleanup.
 
 private:
   bool ir_filter_;
 
+  /// Name of the IDL file we are processing.
   char *filename_;
-  // Name of the IDL file we are processing.
 
+  /**
+   * Directory where the generated file is to be
+   * kept. Default value is 0 for this string which means the current
+   * directory from which the <tao_picml> is called.
+   */
   char *output_dir_;
-  // Directory where the generated file is to be
-  // kept. Default value is 0 for this string which means the current
-  // directory from which the <tao_picml> is called.
 
   /// full path to dtd to be used.
   ACE_CString dtd_;
diff --git a/CIAO/tools/IDL3_to_XMI/be_helper.cpp b/CIAO/tools/IDL3_to_XMI/be_helper.cpp
index 385cc0ce464..6fe250e4a58 100644
--- a/CIAO/tools/IDL3_to_XMI/be_helper.cpp
+++ b/CIAO/tools/IDL3_to_XMI/be_helper.cpp
@@ -1,23 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_helper.cpp
-//
-// = DESCRIPTION
-//   Provides helper classes to print generated code to the output
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-//    Improvements by Carlos O'Ryan
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    be_helper.cpp
+ *
+ *  $Id$
+ *
+ * Provides helper classes to print generated code to the output
+ *
+ *
+ *  @author Aniruddha Gokhale Improvements by Carlos O'Ryan
+ */
+//=============================================================================
+
 
 #include "be_helper.h"
 #include "idl_defines.h"
diff --git a/CIAO/tools/IDL3_to_XMI/be_sunsoft.h b/CIAO/tools/IDL3_to_XMI/be_sunsoft.h
index 5aef8a66d4d..e1c42fc1276 100644
--- a/CIAO/tools/IDL3_to_XMI/be_sunsoft.h
+++ b/CIAO/tools/IDL3_to_XMI/be_sunsoft.h
@@ -12,12 +12,13 @@
 
 #include "be_helper.h"
 
+/**
+ * @class TAO_SunSoft_OutStream
+ *
+ * Backend specific to SunSoft AST nodes
+ */
 class TAO_SunSoft_OutStream : public TAO_OutStream
 {
-  // =TITLE
-  //  TAO_SunSoft_OutStream
-  // =DESCRIPTION
-  //  Backend specific to SunSoft AST nodes
 public:
   TAO_SunSoft_OutStream (void);
   // constructor
diff --git a/CIAO/tools/IDL3_to_XMI/identifier_helper.h b/CIAO/tools/IDL3_to_XMI/identifier_helper.h
index a414b8fadd5..76eec29e26b 100644
--- a/CIAO/tools/IDL3_to_XMI/identifier_helper.h
+++ b/CIAO/tools/IDL3_to_XMI/identifier_helper.h
@@ -1,21 +1,18 @@
-// $Id$
 
 /* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_IDL3_TO_IDL2_BE_DLL
-//
-// = FILENAME
-//    identifier_helper.h
-//
-// = DESCRIPTION
-//    Utilities associated with UTL_Identifier.
-//
-// = AUTHOR
-//    Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    identifier_helper.h
+ *
+ *  $Id$
+ *
+ *  Utilities associated with UTL_Identifier.
+ *
+ *
+ *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
 
 #ifndef IDENTIFIER_HELPER_H
 #define IDENTIFIER_HELPER_H