diff options
Diffstat (limited to 'TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp')
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp | 157 |
1 files changed, 44 insertions, 113 deletions
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp index 29fb9ac421f..5840ace6337 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp @@ -22,17 +22,12 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc ( const char * id, const char * name, - const CORBA::StructMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::StructMemberSeq & members) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_struct_tc (id, - name, - members - ACE_ENV_ARG_PARAMETER); + return tcf.create_struct_tc (id, name, members); } CORBA::TypeCode_ptr @@ -40,9 +35,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( const char * id, const char * name, CORBA::TypeCode_ptr discriminator_type, - const CORBA::UnionMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::UnionMemberSeq & members) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -51,16 +44,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( name, discriminator_type, members - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( const char * id, const char * name, - const CORBA::EnumMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::EnumMemberSeq & members) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -68,16 +59,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( return tcf.create_enum_tc (id, name, members - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( const char * id, const char * name, - CORBA::TypeCode_ptr original_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr original_type) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -85,16 +74,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( return tcf.create_alias_tc (id, name, original_type - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( const char * id, const char * name, - const CORBA::StructMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::StructMemberSeq & members) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -102,93 +89,71 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( return tcf.create_exception_tc (id, name, members - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc ( const char * id, - const char * name - ACE_ENV_ARG_DECL - ) + const char * name) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_interface_tc (id, name - ACE_ENV_ARG_PARAMETER); + ); } CORBA::TypeCode_ptr -TAO_TypeCodeFactory_Adapter_Impl::create_string_tc ( - CORBA::ULong bound - ACE_ENV_ARG_DECL - ) +TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (CORBA::ULong bound) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_string_tc (bound - ACE_ENV_ARG_PARAMETER); + return tcf.create_string_tc (bound); } CORBA::TypeCode_ptr -TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc ( - CORBA::ULong bound - ACE_ENV_ARG_DECL - ) +TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (CORBA::ULong bound) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_wstring_tc (bound - ACE_ENV_ARG_PARAMETER); + return tcf.create_wstring_tc (bound); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale - ACE_ENV_ARG_DECL - ) + CORBA::UShort scale) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_fixed_tc (digits, - scale - ACE_ENV_ARG_PARAMETER); + return tcf.create_fixed_tc (digits, scale); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr element_type) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_sequence_tc (bound, - element_type - ACE_ENV_ARG_PARAMETER); + return tcf.create_sequence_tc (bound, element_type); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr element_type) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_array_tc (length, - element_type - ACE_ENV_ARG_PARAMETER); + return tcf.create_array_tc (length, element_type); } CORBA::TypeCode_ptr @@ -197,9 +162,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( const char * name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq & members - ACE_ENV_ARG_DECL - ) + const CORBA::ValueMemberSeq & members) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -208,113 +171,83 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( name, type_modifier, concrete_base, - members - ACE_ENV_ARG_PARAMETER); + members); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc ( const char * id, const char * name, - CORBA::TypeCode_ptr boxed_type - ACE_ENV_ARG_DECL - ) + CORBA::TypeCode_ptr boxed_type) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_value_box_tc (id, - name, - boxed_type - ACE_ENV_ARG_PARAMETER); + return tcf.create_value_box_tc (id, name, boxed_type); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_native_tc ( const char * id, - const char * name - ACE_ENV_ARG_DECL - ) + const char * name) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_native_tc (id, - name - ACE_ENV_ARG_PARAMETER); + return tcf.create_native_tc (id, name); } CORBA::TypeCode_ptr -TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc ( - const char * id - ACE_ENV_ARG_DECL - ) +TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (const char * id) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_recursive_tc (id - ACE_ENV_ARG_PARAMETER); + return tcf.create_recursive_tc (id); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc ( const char * id, - const char * name - ACE_ENV_ARG_DECL - ) + const char * name) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_abstract_interface_tc (id, - name - ACE_ENV_ARG_PARAMETER); + return tcf.create_abstract_interface_tc (id, name); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc ( const char * id, - const char * name - ACE_ENV_ARG_DECL - ) + const char * name) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_local_interface_tc (id, - name - ACE_ENV_ARG_PARAMETER); + return tcf.create_local_interface_tc (id, name); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_component_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_component_tc (id, - name - ACE_ENV_ARG_PARAMETER); + return tcf.create_component_tc (id, name); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_home_tc ( const char *id, - const char *name - ACE_ENV_ARG_DECL - ) + const char *name) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_home_tc (id, - name - ACE_ENV_ARG_PARAMETER); + return tcf.create_home_tc (id, name); } CORBA::TypeCode_ptr @@ -323,9 +256,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc ( const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA::ValueMemberSeq &members - ACE_ENV_ARG_DECL - ) + const CORBA::ValueMemberSeq &members) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; @@ -335,7 +266,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc ( type_modifier, concrete_base, members - ACE_ENV_ARG_PARAMETER); + ); } // -- @@ -346,7 +277,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( char const * /* name */, ACE_Array_Base<CORBA::String_var> const & /* enumerators */, CORBA::ULong /* ncases */ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } @@ -360,7 +291,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_except_tc ( TAO::TypeCode::Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > const & /* fields */, CORBA::ULong /* nfields */ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } @@ -376,7 +307,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( CORBA::Long /* default_index */, char const * /* default_case_name */, CORBA::TypeCode_ptr /* default_case_type */ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } @@ -392,7 +323,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_event_tc ( TAO::TypeCode::Value_Field<CORBA::String_var, CORBA::TypeCode_var> > const & /* fields */, CORBA::ULong /* nfields */ - ACE_ENV_ARG_DECL) + ) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); } |