1 files changed, 11 insertions, 55 deletions
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 5840ace6337..2453262a6f6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -23,7 +23,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc (
     const char * id,
     const char * name,
     const CORBA::StructMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -36,15 +35,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
     const char * name,
     CORBA::TypeCode_ptr discriminator_type,
     const CORBA::UnionMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_union_tc (id,
-                              name,
-                              discriminator_type,
-                              members
-                             );
+  return tcf.create_union_tc (id, name, discriminator_type, members);
 }
 
 CORBA::TypeCode_ptr
@@ -52,14 +46,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
     const char * id,
     const char * name,
     const CORBA::EnumMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_enum_tc (id,
-                             name,
-                             members
-                            );
+  return tcf.create_enum_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
@@ -67,14 +57,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
     const char * id,
     const char * name,
     CORBA::TypeCode_ptr original_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_alias_tc (id,
-                              name,
-                              original_type
-                             );
+  return tcf.create_alias_tc (id, name, original_type);
 }
 
 CORBA::TypeCode_ptr
@@ -82,32 +68,24 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
     const char * id,
     const char * name,
     const CORBA::StructMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_exception_tc (id,
-                                  name,
-                                  members
-                                 );
+  return tcf.create_exception_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc (
     const char * id,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_interface_tc (id,
-                                  name
-                                 );
+  return tcf.create_interface_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -116,7 +94,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (CORBA::ULong bound)
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (CORBA::ULong bound)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -127,7 +104,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc (
     CORBA::UShort digits,
     CORBA::UShort scale)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -138,7 +114,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc (
     CORBA::ULong bound,
     CORBA::TypeCode_ptr element_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -149,7 +124,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_array_tc (
     CORBA::ULong length,
     CORBA::TypeCode_ptr element_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -163,15 +137,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
     const CORBA::ValueMemberSeq & members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_value_tc (id,
-                              name,
-                              type_modifier,
-                              concrete_base,
-                              members);
+  return tcf.create_value_tc (id, name, type_modifier, concrete_base, members);
 }
 
 CORBA::TypeCode_ptr
@@ -179,7 +148,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc (
     const char * id,
     const char * name,
     CORBA::TypeCode_ptr boxed_type)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -190,7 +158,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
     const char * id,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -199,7 +166,6 @@ TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (const char * id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -210,7 +176,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc (
     const char * id,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -221,7 +186,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc (
     const char * id,
     const char * name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -232,7 +196,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_component_tc (
     const char *id,
     const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -243,7 +206,6 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_home_tc (
     const char *id,
     const char *name)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
@@ -257,16 +219,10 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc (
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
     const CORBA::ValueMemberSeq &members)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_event_tc (id,
-                              name,
-                              type_modifier,
-                              concrete_base,
-                              members
-                             );
+  return tcf.create_event_tc (id, name, type_modifier, concrete_base, members);
 }
 
 // --
@@ -279,7 +235,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
   CORBA::ULong /* ncases */
   )
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::TypeCode_ptr
@@ -293,7 +249,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_except_tc (
   CORBA::ULong /* nfields */
   )
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::TypeCode_ptr
@@ -309,7 +265,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
   CORBA::TypeCode_ptr /* default_case_type */
   )
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::TypeCode_ptr
@@ -325,7 +281,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_event_tc (
   CORBA::ULong /* nfields */
   )
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 // *********************************************************************