diff options
Diffstat (limited to 'TAO/tao/TypeCodeFactory')
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp | 20 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h | 163 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl | 6 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp | 136 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h | 125 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h | 4 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp | 288 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h | 166 |
9 files changed, 426 insertions, 486 deletions
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index 1bdd5372083..36ced983c1f 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -80,7 +80,7 @@ CORBA_TypeCodeFactory_var::operator const ::CORBA_TypeCodeFactory_ptr &() const return this->ptr_; } -CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast +CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast { return this->ptr_; } @@ -140,11 +140,11 @@ CORBA_TypeCodeFactory_var::tao_nil (void) ::CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory_var::tao_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return ::CORBA_TypeCodeFactory::_narrow (p, ACE_TRY_ENV); + return ::CORBA_TypeCodeFactory::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -225,16 +225,16 @@ CORBA_TypeCodeFactory::~CORBA_TypeCodeFactory (void) {} CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL ) { - return CORBA_TypeCodeFactory::_unchecked_narrow (obj, ACE_TRY_ENV); + return CORBA_TypeCodeFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); } CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -272,7 +272,7 @@ void *CORBA_TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h index 982a78ac367..219e40e20e4 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h @@ -75,29 +75,29 @@ class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory_var : public TAO_Base_var { public: CORBA_TypeCodeFactory_var (void); // default constructor - CORBA_TypeCodeFactory_var (CORBA_TypeCodeFactory_ptr p) : ptr_ (p) {} + CORBA_TypeCodeFactory_var (CORBA_TypeCodeFactory_ptr p) : ptr_ (p) {} CORBA_TypeCodeFactory_var (const CORBA_TypeCodeFactory_var &); // copy constructor ~CORBA_TypeCodeFactory_var (void); // destructor - + CORBA_TypeCodeFactory_var &operator= (CORBA_TypeCodeFactory_ptr); CORBA_TypeCodeFactory_var &operator= (const CORBA_TypeCodeFactory_var &); CORBA_TypeCodeFactory_ptr operator-> (void) const; - + operator const CORBA_TypeCodeFactory_ptr &() const; operator CORBA_TypeCodeFactory_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CORBA_TypeCodeFactory_ptr in (void) const; CORBA_TypeCodeFactory_ptr &inout (void); CORBA_TypeCodeFactory_ptr &out (void); CORBA_TypeCodeFactory_ptr _retn (void); CORBA_TypeCodeFactory_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static CORBA_TypeCodeFactory_ptr tao_duplicate (CORBA_TypeCodeFactory_ptr); static void tao_release (CORBA_TypeCodeFactory_ptr); static CORBA_TypeCodeFactory_ptr tao_nil (void); - static CORBA_TypeCodeFactory_ptr tao_narrow (CORBA::Object *, CORBA::Environment &); + static CORBA_TypeCodeFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -151,15 +151,13 @@ public: // the static operations static CORBA_TypeCodeFactory_ptr _duplicate (CORBA_TypeCodeFactory_ptr obj); static CORBA_TypeCodeFactory_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + static CORBA_TypeCodeFactory_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + static CORBA_TypeCodeFactory_ptr _nil (void) { return (CORBA_TypeCodeFactory_ptr)0; @@ -168,10 +166,9 @@ public: virtual CORBA::TypeCode_ptr create_struct_tc ( const char * id, const char * name, - const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_StructMemberSeq & members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -180,10 +177,9 @@ public: const char * id, const char * name, CORBA::TypeCode_ptr discriminator_type, - const CORBA_UnionMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_UnionMemberSeq & members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -191,10 +187,9 @@ public: virtual CORBA::TypeCode_ptr create_enum_tc ( const char * id, const char * name, - const CORBA_EnumMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_EnumMemberSeq & members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -202,10 +197,9 @@ public: virtual CORBA::TypeCode_ptr create_alias_tc ( const char * id, const char * name, - CORBA::TypeCode_ptr original_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr original_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -213,68 +207,61 @@ public: virtual CORBA::TypeCode_ptr create_exception_tc ( const char * id, const char * name, - const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_StructMemberSeq & members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_interface_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char * name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_string_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::ULong bound + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_wstring_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::ULong bound + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::UShort scale + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -284,10 +271,9 @@ public: const char * name, CORBA::Short type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA_ValueMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_ValueMemberSeq & members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -295,80 +281,73 @@ public: virtual CORBA::TypeCode_ptr create_value_box_tc ( const char * id, const char * name, - CORBA::TypeCode_ptr boxed_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr boxed_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_native_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char * name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_recursive_tc ( - const char * id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char * id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char * name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char * name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_component_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char * name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual CORBA::TypeCode_ptr create_home_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char * name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: CORBA_TypeCodeFactory (); - + virtual ~CORBA_TypeCodeFactory (void); private: CORBA_TypeCodeFactory (const CORBA_TypeCodeFactory &); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl index b9575962bd6..bb6a7fe62f0 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl @@ -49,11 +49,11 @@ tao_CORBA_TypeCodeFactory_nil ( ACE_INLINE CORBA_TypeCodeFactory_ptr tao_CORBA_TypeCodeFactory_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return CORBA_TypeCodeFactory::_narrow (p, ACE_TRY_ENV); + return CORBA_TypeCodeFactory::_narrow (p TAO_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp index 65b0d235047..2461a250150 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp @@ -14,8 +14,8 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc ( const char * id, const char * name, - const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_StructMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -23,8 +23,8 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc ( return tcf.create_struct_tc (id, name, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -32,8 +32,8 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( const char * id, const char * name, CORBA::TypeCode_ptr discriminator_type, - const CORBA_UnionMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_UnionMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42,16 +42,16 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc ( return tcf.create_union_tc (id, name, discriminator_type, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( const char * id, const char * name, - const CORBA_EnumMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_EnumMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -59,16 +59,16 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc ( return tcf.create_enum_tc (id, name, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( const char * id, const char * name, - CORBA::TypeCode_ptr original_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::TypeCode_ptr original_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -76,16 +76,16 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc ( return tcf.create_alias_tc (id, name, - original_type, - ACE_TRY_ENV); + original_type + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( const char * id, const char * name, - const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_StructMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -93,94 +93,94 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc ( return tcf.create_exception_tc (id, name, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV + const char * name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_interface_tc (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_string_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV + CORBA::ULong bound + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_string_tc (bound, - ACE_TRY_ENV); + return tcf.create_string_tc (bound + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV + CORBA::ULong bound + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_wstring_tc (bound, - ACE_TRY_ENV); + return tcf.create_wstring_tc (bound + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale, - CORBA::Environment &ACE_TRY_ENV + CORBA::UShort scale + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_fixed_tc (digits, - scale, - ACE_TRY_ENV); + scale + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_sequence_tc (bound, - element_type, - ACE_TRY_ENV); + element_type + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_array_tc (length, - element_type, - ACE_TRY_ENV); + element_type + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr @@ -189,8 +189,8 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( const char * name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA_ValueMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_ValueMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -200,16 +200,16 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc ( name, type_modifier, concrete_base, - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc ( const char * id, const char * name, - CORBA::TypeCode_ptr boxed_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::TypeCode_ptr boxed_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -217,66 +217,66 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc ( return tcf.create_value_box_tc (id, name, - boxed_type, - ACE_TRY_ENV); + boxed_type + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_native_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV + const char * name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_native_tc (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc ( - const char * id, - CORBA::Environment &ACE_TRY_ENV + const char * id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; - return tcf.create_recursive_tc (id, - ACE_TRY_ENV); + return tcf.create_recursive_tc (id + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV + const char * name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_abstract_interface_tc (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc ( const char * id, - const char * name, - CORBA::Environment &ACE_TRY_ENV + const char * name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TypeCodeFactory_i tcf; return tcf.create_local_interface_tc (id, - name, - ACE_TRY_ENV); + name + TAO_ENV_ARG_PARAMETER); } // ********************************************************************* diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h index c83bb32af7c..45764d9a832 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h @@ -33,7 +33,7 @@ * to use the TypeCodeFactory. This is the derived class * that contains the actual implementations. */ -class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Adapter_Impl +class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Adapter_Impl : public TAO_TypeCodeFactory_Adapter { public: @@ -42,93 +42,82 @@ public: virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, const char *name, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, - const CORBA_UnionMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_UnionMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_enum_tc ( const char *id, const char *name, - const CORBA_EnumMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_EnumMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_alias_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr original_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr original_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_exception_tc ( const char *id, const char *name, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_string_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::ULong bound + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_wstring_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::ULong bound + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::UShort scale + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_value_tc ( @@ -136,50 +125,44 @@ public: const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA_ValueMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_ValueMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_value_box_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr boxed_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr boxed_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_recursive_tc ( - const char *id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to force the initialization of the ORB code. @@ -194,13 +177,13 @@ ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl) typedef int (*TAO_Module_Initializer) (void); static TAO_Module_Initializer -TAO_Requires_TypeCodeFactory_Initializer = +TAO_Requires_TypeCodeFactory_Initializer = &TAO_TypeCodeFactory_Adapter_Impl::Initializer; #else static int -TAO_Requires_TypeCodeFactory_Initializer = +TAO_Requires_TypeCodeFactory_Initializer = TAO_TypeCodeFactory_Adapter_Impl::Initializer (); #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */ diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp index 9d6fb8c3313..f3af1fe9ae1 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp @@ -26,8 +26,8 @@ TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void) CORBA::Object_ptr TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr, int, - char * [], - CORBA::Environment &) + char * [] + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_ptr obj; diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h index 0addfac4159..7a02e826e44 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h @@ -38,8 +38,8 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - char *argv [], - CORBA::Environment &) + char *argv [] + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Overload the base class method to create a new instance // of a TypeCodeFactory object. diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index ff0a021efa0..182ba3b48d2 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -16,8 +16,8 @@ TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void) } TAO_TypeCodeFactory_i * -TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr obj, - CORBA::Environment &) +TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -54,25 +54,25 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_struct_tc ( const char *id, const char *name, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->struct_except_tc_common (id, name, members, - CORBA::tk_struct, - ACE_TRY_ENV); + CORBA::tk_struct + TAO_ENV_ARG_PARAMETER); } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, - const CORBA_UnionMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_UnionMemberSeq &members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -90,9 +90,9 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::TypeCode::_nil ()); } - CORBA::Boolean good_disc_type = - this->valid_disc_type (discriminator_type, - ACE_TRY_ENV); + CORBA::Boolean good_disc_type = + this->valid_disc_type (discriminator_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!good_disc_type) @@ -111,7 +111,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::Boolean valid_member = 1; const char *member_name = 0; ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map; - + // No getting around iterating over the members twice. We have // to do it once *before* the overall length is written to the // CDR stream, to know by how much, if any, the number of members @@ -125,13 +125,13 @@ TAO_TypeCodeFactory_i::create_union_tc ( { // Is this a duplicate case label? If so, we have to adjust // the 'length' we encode - a member gets encoded only once. - if (ACE_OS::strcmp (member_name, - members[i - 1].name) + if (ACE_OS::strcmp (member_name, + members[i - 1].name) == 0) { CORBA::Boolean equiv = - members[i].type.in ()->equivalent (members[i - 1].type.in (), - ACE_TRY_ENV); + members[i].type.in ()->equivalent (members[i - 1].type.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); // If adjacent names are the same and their types are equivalent, @@ -178,8 +178,8 @@ TAO_TypeCodeFactory_i::create_union_tc ( tc_holder = members[i].type.in (); // Valid member type? - valid_member = this->valid_content_type (tc_holder, - ACE_TRY_ENV); + valid_member = this->valid_content_type (tc_holder + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_member) @@ -207,8 +207,8 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::TypeCode_var tmp = members[i].label.type (); CORBA::Boolean equiv = - discriminator_type->equivalent (tmp.in (), - ACE_TRY_ENV); + discriminator_type->equivalent (tmp.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!equiv) @@ -223,8 +223,8 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::Boolean unique_labels = this->unique_label_values (members, discriminator_type, - raw_default_index, - ACE_TRY_ENV); + raw_default_index + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!unique_labels) @@ -254,8 +254,8 @@ TAO_TypeCodeFactory_i::create_union_tc ( { // Is this a duplicate case label? If so, skip it - a member // goes into the typecode only once. - if (ACE_OS::strcmp (members[index].name, - members[index - 1].name) + if (ACE_OS::strcmp (members[index].name, + members[index - 1].name) == 0) { continue; @@ -265,7 +265,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( if (index == raw_default_index) { // This is the default label - we have to find a legal value. - CORBA::TCKind kind = discriminator_type->kind (ACE_TRY_ENV); + CORBA::TCKind kind = discriminator_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); this->compute_default_label (kind, @@ -283,8 +283,8 @@ TAO_TypeCodeFactory_i::create_union_tc ( (void) TAO_Marshal_Object::perform_append (tc.in (), &in, - &cdr, - ACE_TRY_ENV); + &cdr + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); } @@ -295,10 +295,10 @@ TAO_TypeCodeFactory_i::create_union_tc ( ACE_Message_Block consolidated_block; - ACE_CDR::consolidate (&consolidated_block, + ACE_CDR::consolidate (&consolidated_block, cdr.begin ()); - CORBA::TypeCode_ptr union_typecode = + CORBA::TypeCode_ptr union_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (union_typecode, @@ -317,8 +317,8 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_enum_tc ( const char *id, const char *name, - const CORBA_EnumMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_EnumMemberSeq &members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -355,7 +355,7 @@ TAO_TypeCodeFactory_i::create_enum_tc ( cdr << len; ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map; - + for (CORBA::ULong index = 0; index < len; ++index) { ACE_CString ext_id (members[index]); @@ -377,10 +377,10 @@ TAO_TypeCodeFactory_i::create_enum_tc ( ACE_Message_Block consolidated_block; - ACE_CDR::consolidate (&consolidated_block, + ACE_CDR::consolidate (&consolidated_block, cdr.begin ()); - CORBA::TypeCode_ptr enum_typecode = + CORBA::TypeCode_ptr enum_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (enum_typecode, @@ -399,8 +399,8 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_alias_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr original_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::TypeCode_ptr original_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -419,8 +419,8 @@ TAO_TypeCodeFactory_i::create_alias_tc ( } CORBA::Boolean valid_content = - this->valid_content_type (original_type, - ACE_TRY_ENV); + this->valid_content_type (original_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_content) @@ -448,10 +448,10 @@ TAO_TypeCodeFactory_i::create_alias_tc ( ACE_Message_Block consolidated_block; - ACE_CDR::consolidate (&consolidated_block, + ACE_CDR::consolidate (&consolidated_block, cdr.begin ()); - CORBA::TypeCode_ptr alias_typecode = + CORBA::TypeCode_ptr alias_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (alias_typecode, @@ -470,36 +470,36 @@ CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_exception_tc ( const char *id, const char *name, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->struct_except_tc_common (id, name, members, - CORBA::tk_except, - ACE_TRY_ENV); + CORBA::tk_except + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV + const char *name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, - CORBA::tk_objref, - ACE_TRY_ENV); + CORBA::tk_objref + TAO_ENV_ARG_PARAMETER); } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_string_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV + CORBA::ULong bound + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -509,7 +509,7 @@ TAO_TypeCodeFactory_i::create_string_tc ( cdr << bound; - CORBA::TypeCode_ptr string_typecode = + CORBA::TypeCode_ptr string_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (string_typecode, @@ -524,10 +524,10 @@ TAO_TypeCodeFactory_i::create_string_tc ( return string_typecode; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_wstring_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV + CORBA::ULong bound + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -537,7 +537,7 @@ TAO_TypeCodeFactory_i::create_wstring_tc ( cdr << bound; - CORBA::TypeCode_ptr wstring_typecode = + CORBA::TypeCode_ptr wstring_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (wstring_typecode, @@ -552,29 +552,29 @@ TAO_TypeCodeFactory_i::create_wstring_tc ( return wstring_typecode; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_fixed_tc ( CORBA::UShort /* digits */, - CORBA::UShort /* scale */, - CORBA::Environment & /* ACE_TRY_ENV */ + CORBA::UShort /* scale */ + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO - return 0; + return 0; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean valid_element = - this->valid_content_type (element_type, - ACE_TRY_ENV); + this->valid_content_type (element_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_element) @@ -594,10 +594,10 @@ TAO_TypeCodeFactory_i::create_sequence_tc ( ACE_Message_Block consolidated_block; - ACE_CDR::consolidate (&consolidated_block, + ACE_CDR::consolidate (&consolidated_block, cdr.begin ()); - CORBA::TypeCode_ptr sequence_typecode = + CORBA::TypeCode_ptr sequence_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (sequence_typecode, @@ -612,17 +612,17 @@ TAO_TypeCodeFactory_i::create_sequence_tc ( return sequence_typecode; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean valid_element = - this->valid_content_type (element_type, - ACE_TRY_ENV); + this->valid_content_type (element_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_element) @@ -642,10 +642,10 @@ TAO_TypeCodeFactory_i::create_array_tc ( ACE_Message_Block consolidated_block; - ACE_CDR::consolidate (&consolidated_block, + ACE_CDR::consolidate (&consolidated_block, cdr.begin ()); - CORBA::TypeCode_ptr array_typecode = + CORBA::TypeCode_ptr array_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (array_typecode, @@ -660,27 +660,27 @@ TAO_TypeCodeFactory_i::create_array_tc ( return array_typecode; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_value_tc ( const char * /* id */, const char * /* name */, CORBA::ValueModifier /* type_modifier */, CORBA::TypeCode_ptr /* concrete_base */, - const CORBA_ValueMemberSeq & /* members */, - CORBA::Environment & /* ACE_TRY_ENV */ + const CORBA_ValueMemberSeq & /* members */ + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO - return 0; + return 0; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_value_box_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr boxed_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::TypeCode_ptr boxed_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -700,8 +700,8 @@ TAO_TypeCodeFactory_i::create_value_box_tc ( } CORBA::Boolean valid_content = - this->valid_content_type (boxed_type, - ACE_TRY_ENV); + this->valid_content_type (boxed_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_content) @@ -723,10 +723,10 @@ TAO_TypeCodeFactory_i::create_value_box_tc ( ACE_Message_Block consolidated_block; - ACE_CDR::consolidate (&consolidated_block, + ACE_CDR::consolidate (&consolidated_block, cdr.begin ()); - CORBA::TypeCode_ptr value_box_typecode = + CORBA::TypeCode_ptr value_box_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (value_box_typecode, @@ -741,85 +741,85 @@ TAO_TypeCodeFactory_i::create_value_box_tc ( return value_box_typecode; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_native_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV + const char *name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, - CORBA::tk_native, - ACE_TRY_ENV); + CORBA::tk_native + TAO_ENV_ARG_PARAMETER); } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_recursive_tc ( - const char * /* id */, - CORBA::Environment & /* ACE_TRY_ENV */ + const char * /* id */ + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO - return 0; + return 0; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_abstract_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV + const char *name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, - CORBA::tk_abstract_interface, - ACE_TRY_ENV); + CORBA::tk_abstract_interface + TAO_ENV_ARG_PARAMETER); } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_local_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV + const char *name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, - CORBA::tk_local_interface, - ACE_TRY_ENV); + CORBA::tk_local_interface + TAO_ENV_ARG_PARAMETER); } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_component_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV + const char *name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, - CORBA::tk_component, - ACE_TRY_ENV); + CORBA::tk_component + TAO_ENV_ARG_PARAMETER); } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_home_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV + const char *name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->create_tc_common (id, name, - CORBA::tk_home, - ACE_TRY_ENV); + CORBA::tk_home + TAO_ENV_ARG_PARAMETER); } void @@ -1003,12 +1003,12 @@ TAO_TypeCodeFactory_i::compute_default_label ( } } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::create_tc_common ( const char *id, const char *name, - CORBA::TCKind kind, - CORBA::Environment &ACE_TRY_ENV + CORBA::TCKind kind + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1037,10 +1037,10 @@ TAO_TypeCodeFactory_i::create_tc_common ( ACE_Message_Block consolidated_block; - ACE_CDR::consolidate (&consolidated_block, + ACE_CDR::consolidate (&consolidated_block, cdr.begin ()); - CORBA::TypeCode_ptr result = + CORBA::TypeCode_ptr result = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (result, @@ -1055,13 +1055,13 @@ TAO_TypeCodeFactory_i::create_tc_common ( return result; } -CORBA::TypeCode_ptr +CORBA::TypeCode_ptr TAO_TypeCodeFactory_i::struct_except_tc_common ( const char *id, const char *name, const CORBA_StructMemberSeq &members, - CORBA::TCKind kind, - CORBA::Environment &ACE_TRY_ENV + CORBA::TCKind kind + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1110,8 +1110,8 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( // Valid member type? tc_holder = members[index].type.in (); - valid_member = this->valid_content_type (tc_holder, - ACE_TRY_ENV); + valid_member = this->valid_content_type (tc_holder + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); if (!valid_member) @@ -1151,10 +1151,10 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( ACE_Message_Block consolidated_block; - ACE_CDR::consolidate (&consolidated_block, + ACE_CDR::consolidate (&consolidated_block, cdr.begin ()); - CORBA::TypeCode_ptr new_typecode = + CORBA::TypeCode_ptr new_typecode = CORBA::TypeCode::_nil (); ACE_NEW_THROW_EX (new_typecode, @@ -1169,7 +1169,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common ( return new_typecode; } -CORBA::Boolean +CORBA::Boolean TAO_TypeCodeFactory_i::valid_name (const char *name) { if (!isalpha (*name)) @@ -1194,7 +1194,7 @@ TAO_TypeCodeFactory_i::valid_name (const char *name) return 1; } -CORBA::Boolean +CORBA::Boolean TAO_TypeCodeFactory_i::valid_id (const char *id) { ACE_CString safety (id); @@ -1208,9 +1208,9 @@ TAO_TypeCodeFactory_i::valid_id (const char *id) ACE_CString format (safety.substr (0, pos)); - if (format == "IDL" - || format == "RMI" - || format == "DCE" + if (format == "IDL" + || format == "RMI" + || format == "DCE" || format == "LOCAL") { return 1; @@ -1219,11 +1219,11 @@ TAO_TypeCodeFactory_i::valid_id (const char *id) return 0; } -CORBA::Boolean -TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV) +CORBA::Boolean +TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc + TAO_ENV_ARG_DECL) { - CORBA::TCKind kind = tc->kind (ACE_TRY_ENV); + CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (kind == CORBA::tk_null @@ -1236,13 +1236,13 @@ TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc, return 1; } -CORBA::Boolean +CORBA::Boolean TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members, CORBA::TypeCode_ptr disc_tc, - CORBA::ULong default_index_slot, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong default_index_slot + TAO_ENV_ARG_DECL) { - CORBA::TCKind disc_kind = disc_tc->kind (ACE_TRY_ENV); + CORBA::TCKind disc_kind = disc_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = members.length (); @@ -1390,11 +1390,11 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members, return 1; } -CORBA::Boolean -TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV) +CORBA::Boolean +TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc + TAO_ENV_ARG_DECL) { - CORBA::TCKind kind = tc->kind (ACE_TRY_ENV); + CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (kind == CORBA::tk_enum diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h index d102f4f571a..ad58d903275 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h @@ -49,102 +49,90 @@ public: /// = LocalObject methods static TAO_TypeCodeFactory_i *_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + virtual void *_tao_QueryInterface (ptr_arith_t type); virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, const char *name, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_union_tc ( const char *id, const char *name, CORBA::TypeCode_ptr discriminator_type, - const CORBA_UnionMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_UnionMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_enum_tc ( const char *id, const char *name, - const CORBA_EnumMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_EnumMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_alias_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr original_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr original_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_exception_tc ( const char *id, const char *name, - const CORBA_StructMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_StructMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_string_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::ULong bound + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_wstring_tc ( - CORBA::ULong bound, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::ULong bound + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_fixed_tc ( CORBA::UShort digits, - CORBA::UShort scale, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::UShort scale + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_sequence_tc ( CORBA::ULong bound, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_array_tc ( CORBA::ULong length, - CORBA::TypeCode_ptr element_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr element_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_value_tc ( @@ -152,66 +140,58 @@ public: const char *name, CORBA::ValueModifier type_modifier, CORBA::TypeCode_ptr concrete_base, - const CORBA_ValueMemberSeq &members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA_ValueMemberSeq &members + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_value_box_tc ( const char *id, const char *name, - CORBA::TypeCode_ptr boxed_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TypeCode_ptr boxed_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_native_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_recursive_tc ( - const char *id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_abstract_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_local_interface_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_component_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr create_home_tc ( const char *id, - const char *name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const char *name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -225,10 +205,9 @@ private: CORBA::TypeCode_ptr create_tc_common ( const char *id, const char *name, - CORBA::TCKind kind, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TCKind kind + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); /// Code for structs and unions is identical except for TCKind. @@ -236,24 +215,23 @@ private: const char *id, const char *name, const CORBA_StructMemberSeq &members, - CORBA::TCKind kind, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::TCKind kind + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); /// If any of these fail, we raise a spec-defined minor code /// of BAD_PARAM or BAD_TYPECODE. CORBA::Boolean valid_name (const char *name); CORBA::Boolean valid_id (const char *id); - CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc + TAO_ENV_ARG_DECL); CORBA::Boolean unique_label_values (const CORBA_UnionMemberSeq &members, CORBA::TypeCode_ptr disc_tc, - CORBA::ULong default_index_slot, - CORBA::Environment &ACE_TRY_ENV); - CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV); + CORBA::ULong default_index_slot + TAO_ENV_ARG_DECL); + CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc + TAO_ENV_ARG_DECL); /// A string in a TAO typecode contains padding to give it a /// total size which is a multiple of 4 bytes. |