1 files changed, 37 insertions, 56 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
index b29dba18492..23d633c3366 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -1,22 +1,19 @@
 // -*- C++ -*-
 
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs/IFRService
-//
-// = FILENAME
-//    UnionDef_i.h
-//
-// = DESCRIPTION
-//    UnionDef servant class.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    UnionDef_i.h
+ *
+ *  $Id$
+ *
+ *  UnionDef servant class.
+ *
+ *
+ *  @author Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef TAO_UNIONDEF_I_H
 #define TAO_UNIONDEF_I_H
@@ -46,86 +43,70 @@ class TAO_IFRService_Export TAO_UnionDef_i : public virtual TAO_TypedefDef_i,
   //    Represents an OMG IDL union definition.
   //
 public:
+  /// Constructor
   TAO_UnionDef_i (TAO_Repository_i *repo);
-  // Constructor
 
+  /// Destructor
   virtual ~TAO_UnionDef_i (void);
-  // Destructor
 
+  /// Return our definition kind.
   virtual CORBA::DefinitionKind def_kind ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Return our definition kind.
-
+  /// Remove the repository entry and its contents.
   virtual void destroy ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Remove the repository entry and its contents.
+;
 
   virtual void destroy_i ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type ()
+;
 
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
-
+  /// From IDLType_i's pure virtual function.
   virtual CORBA::TypeCode_ptr type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // From IDLType_i's pure virtual function.
+;
 
   virtual CORBA::TypeCode_ptr discriminator_type ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::TypeCode_ptr discriminator_type_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::IDLType_ptr discriminator_type_def ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::IDLType_ptr discriminator_type_def_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void discriminator_type_def (
       CORBA::IDLType_ptr discriminator_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void discriminator_type_def_i (
       CORBA::IDLType_ptr discriminator_type_def)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual CORBA::UnionMemberSeq *members ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   CORBA::UnionMemberSeq *members_i ()
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   virtual void members (
       const CORBA::UnionMemberSeq &members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
   void members_i (
       const CORBA::UnionMemberSeq &members)
-
-    ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
 private:
+  /// Used by members() to get each member's label value.
   void fetch_label (
       const ACE_Configuration_Section_Key member_key,
-      CORBA::UnionMember &member)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Used by members() to get each member's label value.
+      CORBA::UnionMember &member);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL