Fri Jul 15 07:29:03 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/orbsvcs/IFRService/AliasDef_i.h:
        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.h:
        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h:
        * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h:
        * orbsvcs/orbsvcs/IFRService/ModuleDef_i.h:
        * orbsvcs/orbsvcs/IFRService/NativeDef_i.h:
        * orbsvcs/orbsvcs/IFRService/OperationDef_i.h:
        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h:
        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h:
        * orbsvcs/orbsvcs/IFRService/PublishesDef_i.h:
        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.h:
        * orbsvcs/orbsvcs/IFRService/StringDef_i.h:
        * orbsvcs/orbsvcs/IFRService/StructDef_i.h:
        * orbsvcs/orbsvcs/IFRService/TypedefDef_i.h:
        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h:
        * orbsvcs/orbsvcs/IFRService/WstringDef_i.h:
          Layout changes

18 files changed, 163 insertions, 317 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 27c3a424a78..4ac63920953 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Fri Jul 15 07:29:03 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h:
+        * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ModuleDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/NativeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/PublishesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
+        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/StringDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/TypedefDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/WstringDef_i.h:
+          Layout changes
+
 Fri Jul 15 07:11:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
index 5c399b215bc..d997089020d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -45,30 +45,21 @@ public:
   virtual ~TAO_AliasDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::IDLType_ptr original_type_def ()
-;
+  virtual CORBA::IDLType_ptr original_type_def ();
 
-  CORBA::IDLType_ptr original_type_def_i ()
-;
+  CORBA::IDLType_ptr original_type_def_i ();
 
-  virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def)
-;
+  virtual void original_type_def (CORBA::IDLType_ptr original_type_def);
 
-  void original_type_def_i (
-      CORBA::IDLType_ptr original_type_def)
-;
+  void original_type_def_i (CORBA::IDLType_ptr original_type_def);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
index 52c8a670e22..7e15a7a88a7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
@@ -49,60 +49,40 @@ public:
   virtual ~TAO_ArrayDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry.
-  virtual void destroy ()
-;
+  virtual void destroy ();
 
-  virtual void destroy_i ()
-;
+  virtual void destroy_i ();
 
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::ULong length ()
-;
+  virtual CORBA::ULong length ();
 
-  CORBA::ULong length_i ()
-;
+  CORBA::ULong length_i ();
 
-  virtual void length (
-      CORBA::ULong length)
-;
+  virtual void length (CORBA::ULong length);
 
-  void length_i (
-      CORBA::ULong length)
-;
+  void length_i (CORBA::ULong length);
 
-  virtual CORBA::TypeCode_ptr element_type ()
-;
+  virtual CORBA::TypeCode_ptr element_type ();
 
-  CORBA::TypeCode_ptr element_type_i ()
-;
+  CORBA::TypeCode_ptr element_type_i ();
 
-  virtual CORBA::IDLType_ptr element_type_def ()
-;
+  virtual CORBA::IDLType_ptr element_type_def ();
 
-  CORBA::IDLType_ptr element_type_def_i ()
-;
+  CORBA::IDLType_ptr element_type_def_i ();
 
-  virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def)
-;
+  virtual void element_type_def (CORBA::IDLType_ptr element_type_def);
 
-  void element_type_def_i (
-      CORBA::IDLType_ptr element_type_def)
-;
+  void element_type_def_i (CORBA::IDLType_ptr element_type_def);
 
 private:
   /// Destroys an anonymous non-primitive element type.
-  void destroy_element_type ()
-;
+  void destroy_element_type ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
index 33b6dae3315..5661a95668d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
@@ -49,12 +49,10 @@ public:
 
   virtual
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-  describe_ext_interface (
-    );
+  describe_ext_interface (void);
 
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
-  describe_ext_interface_i (
-    );
+  describe_ext_interface_i (void);
 
   virtual CORBA::ExtAttributeDef_ptr create_ext_attribute (
       const char *id,
@@ -63,8 +61,7 @@ public:
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
-      const CORBA::ExceptionDefSeq &set_exceptions
-    );
+      const CORBA::ExceptionDefSeq &set_exceptions);
 
   CORBA::ExtAttributeDef_ptr create_ext_attribute_i (
       const char *id,
@@ -73,8 +70,7 @@ public:
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
-      const CORBA::ExceptionDefSeq &set_exceptions
-    );
+      const CORBA::ExceptionDefSeq &set_exceptions);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
index 79f58fe8849..1a9030108f7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
@@ -49,16 +49,11 @@ public:
   virtual ~TAO_LocalInterfaceDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (
-    );
+  virtual CORBA::DefinitionKind def_kind (void);
 
-  virtual CORBA::Boolean is_a (
-      const char *interface_id
-    );
+  virtual CORBA::Boolean is_a (const char *interface_id);
 
-  CORBA::Boolean is_a_i (
-      const char *interface_id
-    );
+  CORBA::Boolean is_a_i (const char *interface_id);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
index db35074be55..2302025b8ed 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
@@ -52,24 +52,19 @@ public:
   virtual ~TAO_ModuleDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry.
-  virtual void destroy ()
-;
+  virtual void destroy ();
 
   /// Remove the repository entry.
-  virtual void destroy_i ()
-;
+  virtual void destroy_i ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe ()
-;
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i ()
-;
+  virtual CORBA::Contained::Description *describe_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
index 05465af6784..a280236eaea 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -45,16 +45,13 @@ public:
   virtual ~TAO_NativeDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index 1c561642d4d..17443f7086d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -66,51 +66,41 @@ public:
 
   CORBA::IDLType_ptr result_def_i ();
 
-  virtual void result_def (
-      CORBA::IDLType_ptr result_def);
+  virtual void result_def (CORBA::IDLType_ptr result_def);
 
-  void result_def_i (
-      CORBA::IDLType_ptr result_def);
+  void result_def_i (CORBA::IDLType_ptr result_def);
 
   virtual CORBA::ParDescriptionSeq *params ();
 
   CORBA::ParDescriptionSeq *params_i ();
 
-  virtual void params (
-      const CORBA::ParDescriptionSeq &params);
+  virtual void params (const CORBA::ParDescriptionSeq &params);
 
-  void params_i (
-      const CORBA::ParDescriptionSeq &params);
+  void params_i (const CORBA::ParDescriptionSeq &params);
 
   virtual CORBA::OperationMode mode ();
 
   CORBA::OperationMode mode_i ();
 
-  virtual void mode (
-      CORBA::OperationMode mode);
+  virtual void mode (CORBA::OperationMode mode);
 
-  void mode_i (
-      CORBA::OperationMode mode);
+  void mode_i (CORBA::OperationMode mode);
 
   virtual CORBA::ContextIdSeq *contexts ();
 
   CORBA::ContextIdSeq *contexts_i ();
 
-  virtual void contexts (
-      const CORBA::ContextIdSeq &contexts);
+  virtual void contexts (const CORBA::ContextIdSeq &contexts);
 
-  void contexts_i (
-      const CORBA::ContextIdSeq &contexts);
+  void contexts_i (const CORBA::ContextIdSeq &contexts);
 
   virtual CORBA::ExceptionDefSeq *exceptions ();
 
   CORBA::ExceptionDefSeq *exceptions_i ();
 
-  virtual void exceptions (
-      const CORBA::ExceptionDefSeq &exceptions);
+  virtual void exceptions (const CORBA::ExceptionDefSeq &exceptions);
 
-  void exceptions_i (
-      const CORBA::ExceptionDefSeq &exceptions);
+  void exceptions_i (const CORBA::ExceptionDefSeq &exceptions);
 
   // Common code for containers to call in
   // making descriptions.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
index ce9de3707d0..481aac88cd0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
@@ -49,30 +49,23 @@ public:
   virtual ~TAO_PrimitiveDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// May not be called on a primitive kind - raises BAD_INV_ORDER.
-  virtual void destroy ()
-;
+  virtual void destroy ();
 
   /// Must implement this here because it's pure virtual in the
   /// base class.
-  virtual void destroy_i ()
-;
+  virtual void destroy_i ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::PrimitiveKind kind ()
-;
+  virtual CORBA::PrimitiveKind kind ();
 
-  CORBA::PrimitiveKind kind_i ()
-;
+  CORBA::PrimitiveKind kind_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index aa0c28d07c0..1fccb07b73e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
@@ -48,30 +48,21 @@ public:
   virtual ~TAO_ProvidesDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (
-    );
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe (
-    );
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i (
-    );
+  virtual CORBA::Contained::Description *describe_i ();
 
-  virtual CORBA::InterfaceDef_ptr interface_type (
-    );
+  virtual CORBA::InterfaceDef_ptr interface_type ();
 
-  CORBA::InterfaceDef_ptr interface_type_i (
-    );
+  CORBA::InterfaceDef_ptr interface_type_i ();
 
-  virtual void interface_type (
-      CORBA::InterfaceDef_ptr interface_type
-    );
+  virtual void interface_type (CORBA::InterfaceDef_ptr interface_type);
 
-  void interface_type_i (
-      CORBA::InterfaceDef_ptr interface_type
-    );
+  void interface_type_i (CORBA::InterfaceDef_ptr interface_type);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index 68d5dfb8c99..e8ccdb8ce69 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -46,8 +46,7 @@ public:
   virtual ~TAO_PublishesDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind (
-    );
+  virtual CORBA::DefinitionKind def_kind ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index 0e91418870d..b58d976e93e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -82,80 +82,54 @@ public:
   virtual ~TAO_Repository_i (void);
 
   /// Accessor for the readonly attribute.
-  virtual CORBA::DefinitionKind def_kind (
-    );
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// May not be called on a repository - raises BAD_INV_ORDER.
-  virtual void destroy (
-    );
+  virtual void destroy ();
 
-  virtual CORBA::Contained_ptr lookup_id (
-      const char *search_id
-    );
+  virtual CORBA::Contained_ptr lookup_id (const char *search_id);
 
-  CORBA::Contained_ptr lookup_id_i (
-      const char *search_id
-    );
+  CORBA::Contained_ptr lookup_id_i (const char *search_id);
 
-  virtual CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc
-    );
+  virtual CORBA::TypeCode_ptr get_canonical_typecode (CORBA::TypeCode_ptr tc);
 
-  CORBA::TypeCode_ptr get_canonical_typecode_i (
-      CORBA::TypeCode_ptr tc
-    );
+  CORBA::TypeCode_ptr get_canonical_typecode_i (CORBA::TypeCode_ptr tc);
 
   /// No locking necessary because the database is not
   /// accessed.
-  virtual CORBA::PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind
-    );
+  virtual CORBA::PrimitiveDef_ptr get_primitive (CORBA::PrimitiveKind kind);
 
-  virtual CORBA::StringDef_ptr create_string (
-      CORBA::ULong bound
-    );
+  virtual CORBA::StringDef_ptr create_string (CORBA::ULong bound);
 
-  CORBA::StringDef_ptr create_string_i (
-      CORBA::ULong bound)
-;
+  CORBA::StringDef_ptr create_string_i (CORBA::ULong bound);
 
-  virtual CORBA::WstringDef_ptr create_wstring (
-      CORBA::ULong bound
-    );
+  virtual CORBA::WstringDef_ptr create_wstring (CORBA::ULong bound);
 
-  CORBA::WstringDef_ptr create_wstring_i (
-      CORBA::ULong bound
-    );
+  CORBA::WstringDef_ptr create_wstring_i (CORBA::ULong bound);
 
   virtual CORBA::SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA::IDLType_ptr element_type
-    );
+      CORBA::IDLType_ptr element_type);
 
   CORBA::SequenceDef_ptr create_sequence_i (
       CORBA::ULong bound,
-      CORBA::IDLType_ptr element_type
-    );
+      CORBA::IDLType_ptr element_type);
 
   virtual CORBA::ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA::IDLType_ptr element_type
-    );
+      CORBA::IDLType_ptr element_type);
 
   CORBA::ArrayDef_ptr create_array_i (
       CORBA::ULong length,
-      CORBA::IDLType_ptr element_type
-    );
+      CORBA::IDLType_ptr element_type);
 
   virtual CORBA::FixedDef_ptr create_fixed (
       CORBA::UShort digits,
-      CORBA::Short scale
-    );
+      CORBA::Short scale);
 
   CORBA::FixedDef_ptr create_fixed_i (
       CORBA::UShort digits,
-      CORBA::Short scale
-    );
+      CORBA::Short scale);
 
   /// Called at startup to get everything initialized.
   int repo_init (CORBA::Repository_ptr repo_ref,
@@ -170,19 +144,15 @@ public:
 
   /// Return one of our servants for internal use.
   virtual TAO_IDLType_i *select_idltype (
-      CORBA::DefinitionKind def_kind
-    ) const;
+      CORBA::DefinitionKind def_kind) const;
   virtual TAO_Container_i *select_container (
-      CORBA::DefinitionKind def_kind
-    ) const;
+      CORBA::DefinitionKind def_kind) const;
   virtual TAO_Contained_i *select_contained (
-      CORBA::DefinitionKind def_kind
-    ) const;
+      CORBA::DefinitionKind def_kind) const;
 
   /// Select the right POA for object creation.
   virtual PortableServer::POA_ptr select_poa (
-      CORBA::DefinitionKind def_kind
-    ) const;
+      CORBA::DefinitionKind def_kind) const;
 
   /// Accessor for the POA that is dispatching the current call.
   PortableServer::Current_ptr poa_current (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
index 36eba0e7780..e1886895449 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
@@ -49,62 +49,42 @@ public:
   virtual ~TAO_SequenceDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry.
-  virtual void destroy ()
-;
+  virtual void destroy ();
 
-  virtual void destroy_i ()
-;
+  virtual void destroy_i ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::ULong bound ()
-;
+  virtual CORBA::ULong bound ();
 
-  CORBA::ULong bound_i ()
-;
+  CORBA::ULong bound_i ();
 
-  virtual void bound (
-      CORBA::ULong bound)
-;
+  virtual void bound (CORBA::ULong bound);
 
-  void bound_i (
-      CORBA::ULong bound)
-;
+  void bound_i (CORBA::ULong bound);
 
-  virtual CORBA::TypeCode_ptr element_type ()
-;
+  virtual CORBA::TypeCode_ptr element_type ();
 
-  CORBA::TypeCode_ptr element_type_i ()
-;
+  CORBA::TypeCode_ptr element_type_i ();
 
-  virtual CORBA::IDLType_ptr element_type_def ()
-;
+  virtual CORBA::IDLType_ptr element_type_def ();
 
-  CORBA::IDLType_ptr element_type_def_i ()
-;
+  CORBA::IDLType_ptr element_type_def_i ();
 
-  virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def)
-;
+  virtual void element_type_def (CORBA::IDLType_ptr element_type_def);
 
-  void element_type_def_i (
-      CORBA::IDLType_ptr element_type_def)
-;
+  void element_type_def_i (CORBA::IDLType_ptr element_type_def);
 
 private:
   /// Destroys an anonymous non-primitive element type.
-  void destroy_element_type ()
-;
+  void destroy_element_type ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
index 6a63c9e74c7..5ca0796fd4d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
@@ -50,37 +50,26 @@ public:
   virtual ~TAO_StringDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry.
-  virtual void destroy ()
-;
+  virtual void destroy ();
 
-  virtual void destroy_i ()
-;
+  virtual void destroy_i ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::ULong bound ()
-;
+  virtual CORBA::ULong bound ();
 
-  CORBA::ULong bound_i ()
-;
+  CORBA::ULong bound_i ();
 
-  virtual void bound (
-      CORBA::ULong bound)
-;
+  virtual void bound (CORBA::ULong bound);
 
-  void bound_i (
-      CORBA::ULong bound)
-;
+  void bound_i (CORBA::ULong bound);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
index dfb83bd2b6d..ee5a1c276b9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
@@ -50,37 +50,26 @@ public:
   virtual ~TAO_StructDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry and its contents.
-  virtual void destroy ()
-;
+  virtual void destroy ();
 
-  virtual void destroy_i ()
-;
+  virtual void destroy_i ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's pure virtual function.
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::StructMemberSeq *members ()
-;
+  virtual CORBA::StructMemberSeq *members ();
 
-  CORBA::StructMemberSeq *members_i ()
-;
+  CORBA::StructMemberSeq *members_i ();
 
-  virtual void members (
-      const CORBA::StructMemberSeq &members)
-;
+  virtual void members (const CORBA::StructMemberSeq &members);
 
-  void members_i (
-      const CORBA::StructMemberSeq &members)
-;
+  void members_i (const CORBA::StructMemberSeq &members);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
index a3b469fe789..6c937cfcfb9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
@@ -51,12 +51,10 @@ public:
   virtual ~TAO_TypedefDef_i (void);
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe ()
-;
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i ()
-;
+  virtual CORBA::Contained::Description *describe_i ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
index 00b244b0a97..ba2e4ca169b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
@@ -49,50 +49,33 @@ public:
   virtual ~TAO_ValueMemberDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe ()
-;
+  virtual CORBA::Contained::Description *describe ();
 
   /// From Contained_i's pure virtual function.
-  virtual CORBA::Contained::Description *describe_i ()
-;
+  virtual CORBA::Contained::Description *describe_i ();
 
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
-  CORBA::TypeCode_ptr type_i ()
-;
+  CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::IDLType_ptr type_def ()
-;
+  virtual CORBA::IDLType_ptr type_def ();
 
-  CORBA::IDLType_ptr type_def_i ()
-;
+  CORBA::IDLType_ptr type_def_i ();
 
-  virtual void type_def (
-      CORBA::IDLType_ptr type_def)
-;
+  virtual void type_def (CORBA::IDLType_ptr type_def);
 
-  void type_def_i (
-      CORBA::IDLType_ptr type_def)
-;
+  void type_def_i (CORBA::IDLType_ptr type_def);
 
-  virtual CORBA::Visibility access ()
-;
+  virtual CORBA::Visibility access ();
 
-  CORBA::Visibility access_i ()
-;
+  CORBA::Visibility access_i ();
 
-  virtual void access (
-      CORBA::Visibility access)
-;
+  virtual void access (CORBA::Visibility access);
 
-  void access_i (
-      CORBA::Visibility access)
-;
+  void access_i (CORBA::Visibility access);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
index 6d633516a41..21eb8d08c96 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
@@ -50,37 +50,26 @@ public:
   virtual ~TAO_WstringDef_i (void);
 
   /// Return our definition kind.
-  virtual CORBA::DefinitionKind def_kind ()
-;
+  virtual CORBA::DefinitionKind def_kind ();
 
   /// Remove the repository entry.
-  virtual void destroy ()
-;
+  virtual void destroy ();
 
-  virtual void destroy_i ()
-;
+  virtual void destroy_i ();
 
   /// From IDLType_i's virtual function.
-  virtual CORBA::TypeCode_ptr type ()
-;
+  virtual CORBA::TypeCode_ptr type ();
 
   /// From IDLType_i's virtual function.
-  virtual CORBA::TypeCode_ptr type_i ()
-;
+  virtual CORBA::TypeCode_ptr type_i ();
 
-  virtual CORBA::ULong bound ()
-;
+  virtual CORBA::ULong bound ();
 
-  CORBA::ULong bound_i ()
-;
+  CORBA::ULong bound_i ();
 
-  virtual void bound (
-      CORBA::ULong bound)
-;
+  virtual void bound (CORBA::ULong bound);
 
-  void bound_i (
-      CORBA::ULong bound)
-;
+  void bound_i (CORBA::ULong bound);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL