1 files changed, 45 insertions, 90 deletions

diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
index 3d1f3fd3049..1cb58d87332 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
@@ -54,182 +54,143 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
   // Return our definition kind.
 
   virtual void destroy (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
   // Remove the repository entry.
 
   virtual void destroy_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Contained::Description *describe (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
   // 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::InterfaceDefSeq *supported_interfaces (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq & supported_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq & supported_interfaces
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::InitializerSeq *initializers (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::InitializerSeq *initializers_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void initializers (
       const CORBA::InitializerSeq & initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void initializers_i (
       const CORBA::InitializerSeq & initializers
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueDef_ptr base_value (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueDef_ptr base_value_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void base_value (
       CORBA::ValueDef_ptr base_value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void base_value_i (
       CORBA::ValueDef_ptr base_value
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueDefSeq *abstract_base_values (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueDefSeq *abstract_base_values_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void abstract_base_values (
       const CORBA::ValueDefSeq & abstract_base_values
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void abstract_base_values_i (
       const CORBA::ValueDefSeq & abstract_base_values
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_abstract (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_abstract_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void is_abstract (
       CORBA::Boolean is_abstract
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void is_abstract_i (
       CORBA::Boolean is_abstract
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_custom (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_custom_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void is_custom (
       CORBA::Boolean is_custom
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void is_custom_i (
       CORBA::Boolean is_custom
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_truncatable (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_truncatable_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual void is_truncatable (
       CORBA::Boolean is_truncatable
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   void is_truncatable_i (
       CORBA::Boolean is_truncatable
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::Boolean is_a (
       const char *id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::Boolean is_a_i (
       const char *id
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueDef::FullValueDescription *describe_value (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueDef::FullValueDescription *describe_value_i (
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::ValueMemberDef_ptr create_value_member (
       const char *id,
@@ -237,8 +198,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::Visibility access
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::ValueMemberDef_ptr create_value_member_i (
       const char *id,
@@ -246,8 +206,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::Visibility access
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::AttributeDef_ptr create_attribute (
       const char *id,
@@ -255,8 +214,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::AttributeDef_ptr create_attribute_i (
       const char *id,
@@ -264,8 +222,7 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   virtual CORBA::OperationDef_ptr create_operation (
       const char *id,
@@ -276,8 +233,7 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   CORBA::OperationDef_ptr create_operation_i (
       const char *id,
@@ -288,8 +244,7 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    );
 
   static int name_clash (const char *name);
   // Called from TAO_IFR_Service_Utils::name_exists() when we