diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service')
113 files changed, 11981 insertions, 11981 deletions
diff --git a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp index 227549eb3b9..e572cb5d162 100644 --- a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp @@ -23,7 +23,7 @@ TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void) } CORBA::DefinitionKind -TAO_AbstractInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AbstractInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_AbstractInterface; @@ -31,18 +31,18 @@ TAO_AbstractInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_AbstractInterfaceDef_i::is_a (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0) @@ -51,6 +51,6 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id } return this->TAO_InterfaceDef_i::is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h index 7bcb10f68c4..c70230831ec 100644 --- a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h @@ -50,20 +50,20 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::Boolean is_a ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp index 555df7e18e5..9188ace6df3 100644 --- a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp @@ -22,23 +22,23 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void) } CORBA::DefinitionKind -TAO_AliasDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AliasDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Alias; } CORBA::TypeCode_ptr -TAO_AliasDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -64,31 +64,31 @@ TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (ot_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_alias_tc (id.c_str (), name.c_str (), tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AliasDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString original_type; @@ -113,32 +113,32 @@ TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, original_type.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AliasDef_i::original_type_def (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->original_type_def_i (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AliasDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var original_type = diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.h b/TAO/orbsvcs/IFR_Service/AliasDef_i.h index e2d6535f5c1..e28db7455e2 100644 --- a/TAO/orbsvcs/IFR_Service/AliasDef_i.h +++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.h @@ -51,42 +51,42 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr original_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void original_type_def_i ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp index 95dbe76c837..eb2709dbf92 100644 --- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp @@ -20,27 +20,27 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void) } CORBA::DefinitionKind -TAO_ArrayDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ArrayDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Array; } void -TAO_ArrayDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ArrayDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Only if it is (w)string, fixed, array or sequence. - this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TString name; @@ -54,43 +54,43 @@ TAO_ArrayDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ArrayDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var element_typecode = - this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA::ULong length = this->length_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_array_tc ( length, element_typecode.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::ULong -TAO_ArrayDef_i::length (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::length (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->length_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::ULong -TAO_ArrayDef_i::length_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ArrayDef_i::length_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int length = 0; @@ -103,18 +103,18 @@ TAO_ArrayDef_i::length_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_ArrayDef_i::length (CORBA::ULong length - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->length_i (length - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ArrayDef_i::length_i (CORBA::ULong length - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, @@ -123,16 +123,16 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length } CORBA::TypeCode_ptr -TAO_ArrayDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ArrayDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -148,25 +148,25 @@ TAO_ArrayDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ArrayDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ArrayDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -191,35 +191,35 @@ TAO_ArrayDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, element_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ArrayDef_i::element_type_def (CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->element_type_def_i (element_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (element_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var new_element_path = @@ -232,7 +232,7 @@ TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def void TAO_ArrayDef_i::destroy_element_type ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -267,12 +267,12 @@ TAO_ArrayDef_i::destroy_element_type ( { TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr<TAO_IDLType_i> safety (impl); - impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; break; } diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h index 829ad7154db..5323355564c 100644 --- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h @@ -50,89 +50,89 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong length_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void length ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void length_i ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr element_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr element_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void element_type_def_i ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: void destroy_element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys an anonymous non-primitive element type. diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp index fb94c9430cd..4bf09e2fcf8 100644 --- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp @@ -24,23 +24,23 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void) } CORBA::DefinitionKind -TAO_AttributeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AttributeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Attribute; } CORBA_Contained::Description * -TAO_AttributeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_AttributeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -51,26 +51,26 @@ TAO_AttributeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->value <<= this->make_description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval._retn (); } CORBA::TypeCode_ptr -TAO_AttributeDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_AttributeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; @@ -86,25 +86,25 @@ TAO_AttributeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (type_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AttributeDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; @@ -129,11 +129,11 @@ TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return retval._retn (); @@ -141,23 +141,23 @@ TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->type_def_i (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var type_path = @@ -169,16 +169,16 @@ TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def } CORBA::AttributeMode -TAO_AttributeDef_i::mode (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::mode (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL); - return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::AttributeMode -TAO_AttributeDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_AttributeDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int mode = 0; @@ -191,18 +191,18 @@ TAO_AttributeDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_AttributeDef_i::mode (CORBA::AttributeMode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->mode_i (mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, @@ -211,15 +211,15 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode } CORBA_AttributeDescription -TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_AttributeDescription ad; - ad.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); - ad.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); ACE_TString container_id; @@ -230,13 +230,13 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) ad.defined_in = container_id.c_str (); - ad.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); - ad.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); - ad.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ad.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); /* ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; @@ -321,7 +321,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) TAO_ExceptionDef_i impl (this->repo_, key); - get_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + get_ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); get_ed_seq[i] = get_ed; @@ -405,7 +405,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) TAO_ExceptionDef_i impl (this->repo_, key); - put_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + put_ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ad); put_ed_seq[i] = put_ed; @@ -417,7 +417,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL) } CORBA_ExceptionDefSeq * -TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_TString> path_queue; @@ -482,11 +482,11 @@ TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = CORBA_ExceptionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -494,7 +494,7 @@ TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL) } CORBA_ExceptionDefSeq * -TAO_AttributeDef_i::put_exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_TString> path_queue; @@ -559,11 +559,11 @@ TAO_AttributeDef_i::put_exceptions (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = CORBA_ExceptionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h index e0257965c6d..dba8eb077c1 100644 --- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h @@ -51,79 +51,79 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::AttributeMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::AttributeMode mode_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void mode_i ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_AttributeDescription make_description ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Common code for InterfaceDef to call in @@ -131,12 +131,12 @@ public: // These two are called by Contained::move(). CORBA_ExceptionDefSeq *get_exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ExceptionDefSeq *put_exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp index 58ea7753775..404cbceb9d2 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp @@ -23,39 +23,39 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void) } CORBA::DefinitionKind -TAO_ComponentDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ComponentDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Component; } void -TAO_ComponentDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ComponentDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ComponentDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ComponentDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -63,16 +63,16 @@ TAO_ComponentDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -80,16 +80,16 @@ TAO_ComponentDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A } CORBA_InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -99,20 +99,20 @@ TAO_ComponentDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* void TAO_ComponentDef_i::supported_interfaces ( const CORBA_InterfaceDefSeq &supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->supported_interfaces_i (supported_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ComponentDef_i::supported_interfaces_i ( const CORBA_InterfaceDefSeq & /* supported_interfaces */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -120,16 +120,16 @@ TAO_ComponentDef_i::supported_interfaces_i ( } IR::ComponentDef_ptr -TAO_ComponentDef_i::base_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::base_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ()); - return this->base_component_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->base_component_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::ComponentDef_ptr -TAO_ComponentDef_i::base_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -137,16 +137,16 @@ TAO_ComponentDef_i::base_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_EN } IR::ProvidesDefSeq * -TAO_ComponentDef_i::provides_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::provides_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->provides_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->provides_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::ProvidesDefSeq * -TAO_ComponentDef_i::provides_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::provides_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -154,16 +154,16 @@ TAO_ComponentDef_i::provides_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* T } IR::UsesDefSeq * -TAO_ComponentDef_i::uses_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::uses_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->uses_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->uses_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::UsesDefSeq * -TAO_ComponentDef_i::uses_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::uses_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -171,16 +171,16 @@ TAO_ComponentDef_i::uses_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_E } IR::EmitsDefSeq * -TAO_ComponentDef_i::emits_events (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::emits_events (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->emits_events_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->emits_events_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::EmitsDefSeq * -TAO_ComponentDef_i::emits_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::emits_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -188,16 +188,16 @@ TAO_ComponentDef_i::emits_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_ } IR::PublishesDefSeq * -TAO_ComponentDef_i::publishes_events (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::publishes_events (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->publishes_events_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->publishes_events_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::PublishesDefSeq * -TAO_ComponentDef_i::publishes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::publishes_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -205,16 +205,16 @@ TAO_ComponentDef_i::publishes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ } IR::ConsumesDefSeq * -TAO_ComponentDef_i::consumes_events (TAO_ENV_SINGLE_ARG_DECL) +TAO_ComponentDef_i::consumes_events (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->consumes_events_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumes_events_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::ConsumesDefSeq * -TAO_ComponentDef_i::consumes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::consumes_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -222,7 +222,7 @@ TAO_ComponentDef_i::consumes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_E } CORBA::Boolean -TAO_ComponentDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ComponentDef_i::is_basic (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -235,7 +235,7 @@ TAO_ComponentDef_i::create_provides ( const char *name, const char *version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -245,7 +245,7 @@ TAO_ComponentDef_i::create_provides ( name, version, interface_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::ProvidesDef_ptr @@ -254,7 +254,7 @@ TAO_ComponentDef_i::create_provides_i ( const char * /* name */, const char * /* version */, CORBA_InterfaceDef_ptr /* interface_type */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -268,7 +268,7 @@ TAO_ComponentDef_i::create_uses (const char *id, const char *version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::UsesDef::_nil ()); @@ -278,7 +278,7 @@ TAO_ComponentDef_i::create_uses (const char *id, version, interface_type, is_multiple - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::UsesDef_ptr @@ -287,7 +287,7 @@ TAO_ComponentDef_i::create_uses_i (const char * /* id */, const char * /* version */, CORBA_InterfaceDef_ptr /* interface_type */, CORBA::Boolean /* is_multiple */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -299,7 +299,7 @@ TAO_ComponentDef_i::create_emits (const char *id, const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::EmitsDef::_nil ()); @@ -308,7 +308,7 @@ TAO_ComponentDef_i::create_emits (const char *id, name, version, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::EmitsDef_ptr @@ -316,7 +316,7 @@ TAO_ComponentDef_i::create_emits_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA_ValueDef_ptr /* value */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -328,7 +328,7 @@ TAO_ComponentDef_i::create_publishes (const char *id, const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::PublishesDef::_nil ()); @@ -337,7 +337,7 @@ TAO_ComponentDef_i::create_publishes (const char *id, name, version, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::PublishesDef_ptr @@ -345,7 +345,7 @@ TAO_ComponentDef_i::create_publishes_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA_ValueDef_ptr /* value */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -357,7 +357,7 @@ TAO_ComponentDef_i::create_consumes (const char *id, const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::ConsumesDef::_nil ()); @@ -366,7 +366,7 @@ TAO_ComponentDef_i::create_consumes (const char *id, name, version, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::ConsumesDef_ptr @@ -374,7 +374,7 @@ TAO_ComponentDef_i::create_consumes_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA_ValueDef_ptr /* value */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h index b133e020ab2..cd67aca14c1 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h @@ -52,136 +52,136 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_InterfaceDefSeq *supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDefSeq *supported_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void supported_interfaces ( const CORBA_InterfaceDefSeq &supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void supported_interfaces_i ( const CORBA_InterfaceDefSeq &supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::ComponentDef_ptr base_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::ComponentDef_ptr base_component_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::ProvidesDefSeq *provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::ProvidesDefSeq *provides_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::UsesDefSeq *uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::UsesDefSeq *uses_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::EmitsDefSeq *emits_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::EmitsDefSeq *emits_events_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::PublishesDefSeq *publishes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::PublishesDefSeq *publishes_events_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::ConsumesDefSeq *consumes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::ConsumesDefSeq *consumes_events_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_basic_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -190,7 +190,7 @@ public: const char *name, const char *version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -199,7 +199,7 @@ public: const char *name, const char *version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -209,7 +209,7 @@ public: const char *version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -219,7 +219,7 @@ public: const char *version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -228,7 +228,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -237,7 +237,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -246,7 +246,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -255,7 +255,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -264,7 +264,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -273,7 +273,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp index 20b5ee7ab3e..cbaeaae6da6 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp @@ -27,7 +27,7 @@ TAO_ComponentRepository_i::create_component ( const char *version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -38,7 +38,7 @@ TAO_ComponentRepository_i::create_component ( version, base_component, supports_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::ComponentDef_ptr @@ -48,7 +48,7 @@ TAO_ComponentRepository_i::create_component_i ( const char * /* version */, IR::ComponentDef_ptr /* base_component */, const CORBA_InterfaceDefSeq & /* supports_interfaces */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -64,7 +64,7 @@ TAO_ComponentRepository_i::create_home ( IR::HomeDef_ptr base_component, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -76,7 +76,7 @@ TAO_ComponentRepository_i::create_home ( base_component, managed_component, primary_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::HomeDef_ptr @@ -87,7 +87,7 @@ TAO_ComponentRepository_i::create_home_i ( IR::HomeDef_ptr /* base_component */, IR::ComponentDef_ptr /* managed_component */, CORBA_ValueDef_ptr /* primary_key */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h index 32aae9cde29..304f4580544 100644 --- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h +++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h @@ -60,7 +60,7 @@ public: const char *version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -70,7 +70,7 @@ public: const char *version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -81,7 +81,7 @@ public: IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -92,7 +92,7 @@ public: IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp index c522edbd8f3..c00c5737571 100644 --- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp @@ -23,23 +23,23 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void) } CORBA::DefinitionKind -TAO_ConstantDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ConstantDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Constant; } CORBA_Contained::Description * -TAO_ConstantDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -50,15 +50,15 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_ConstantDescription cd; - cd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + cd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - cd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + cd.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -69,13 +69,13 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) cd.defined_in = container_id.c_str (); - cd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + cd.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - cd.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + cd.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::Any_var val = this->value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var val = this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); cd.value = val.in (); @@ -86,16 +86,16 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_ConstantDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ConstantDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; @@ -111,25 +111,25 @@ TAO_ConstantDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (type_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ConstantDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ConstantDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString type_path; @@ -154,32 +154,32 @@ TAO_ConstantDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ConstantDef_i::type_def (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->type_def_i (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var type_path = @@ -191,19 +191,19 @@ TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def } CORBA::Any * -TAO_ConstantDef_i::value (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Any * -TAO_ConstantDef_i::value_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::TypeCode_var tc = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); void *ref = 0; @@ -239,21 +239,21 @@ TAO_ConstantDef_i::value_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_ConstantDef_i::value (const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->value_i (value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ConstantDef_i::value_i (const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::TypeCode_var my_tc = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var my_tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var val_tc = value.type (); @@ -263,7 +263,7 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value ACE_Message_Block *mb = value._tao_get_cdr (); - CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; switch (kind) diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h index e2ad2105210..05b997877db 100644 --- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h @@ -50,74 +50,74 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any *value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Any *value_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void value ( const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void value_i ( const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp index 9710a5fb7ee..e03833001b3 100644 --- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp @@ -21,39 +21,39 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void) } CORBA::DefinitionKind -TAO_ConsumesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ConsumesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Consumes; } -void -TAO_ConsumesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_ConsumesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_ConsumesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_ConsumesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ConsumesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ConsumesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ConsumesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ConsumesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h index 20c1acf586d..854462108ed 100644 --- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h @@ -51,30 +51,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.cpp b/TAO/orbsvcs/IFR_Service/Contained_i.cpp index 44414e16b2a..a4cf9266e73 100644 --- a/TAO/orbsvcs/IFR_Service/Contained_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Contained_i.cpp @@ -20,16 +20,16 @@ TAO_Contained_i::~TAO_Contained_i (void) } void -TAO_Contained_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -85,16 +85,16 @@ TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_Contained_i::id (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_Contained_i::id_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::id_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; @@ -107,18 +107,18 @@ TAO_Contained_i::id_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_Contained_i::id (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->id_i (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_Contained_i::id_i (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString tmp; @@ -162,16 +162,16 @@ TAO_Contained_i::id_i (const char *id } char * -TAO_Contained_i::name (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_Contained_i::name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; @@ -183,16 +183,16 @@ TAO_Contained_i::name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_Contained_i::version (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::version (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_Contained_i::version_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::version_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString retval; @@ -205,23 +205,23 @@ TAO_Contained_i::version_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_Contained_i::name (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->name_i (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_Contained_i::name_i (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if name already exists in this container. CORBA::Boolean exists = this->name_exists (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (exists) @@ -253,18 +253,18 @@ TAO_Contained_i::name_i (const char *name void TAO_Contained_i::version (const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->version_i (version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_Contained_i::version_i (const char *version - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_string_value (this->section_key_, @@ -273,16 +273,16 @@ TAO_Contained_i::version_i (const char *version } CORBA_Container_ptr -TAO_Contained_i::defined_in (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::defined_in (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_Container::_nil ()); - return this->defined_in_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->defined_in_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Container_ptr -TAO_Contained_i::defined_in_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString container_id; @@ -315,27 +315,27 @@ TAO_Contained_i::defined_in_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, container_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Container::_nil ()); CORBA_Container_var retval = CORBA_Container::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Container::_nil ()); return retval._retn (); } char * -TAO_Contained_i::absolute_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::absolute_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->absolute_name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->absolute_name_i (ACE_ENV_SINGLE_ARG_PARAMETER); } char * -TAO_Contained_i::absolute_name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::absolute_name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString absolute_name; @@ -347,16 +347,16 @@ TAO_Contained_i::absolute_name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA_Repository_ptr -TAO_Contained_i::containing_repository (TAO_ENV_SINGLE_ARG_DECL) +TAO_Contained_i::containing_repository (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_Repository::_nil ()); - return this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Repository_ptr -TAO_Contained_i::containing_repository_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Contained_i::containing_repository_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->repo_->repo_objref (); @@ -366,7 +366,7 @@ void TAO_Contained_i::move (CORBA_Container_ptr new_container, const char *new_name, const char *new_version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; @@ -375,12 +375,12 @@ TAO_Contained_i::move (CORBA_Container_ptr new_container, new_name, new_version, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_Contained_i::name_exists (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString container_id; @@ -391,7 +391,7 @@ TAO_Contained_i::name_exists (const char *name if (container_id == "") { return this->repo_->name_exists (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TString container_path; @@ -485,15 +485,15 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, const char *new_name, const char *new_version, CORBA::Boolean cleanup - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Repository_var my_repo = - this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::DefinitionKind container_dk = - new_container->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + new_container->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_Configuration_Section_Key container_key; @@ -516,7 +516,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (new_container - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var container_path = @@ -529,13 +529,13 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_Contained_i *impl = this->repo_->servant_factory ()->create_contained (container_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr<TAO_Contained_i> safety (impl); CORBA_Repository_var your_repo = - impl->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (my_repo.in () != your_repo.in ()) @@ -545,14 +545,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, container_impl = this->repo_->servant_factory ()->create_container (container_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::DefinitionKind my_dk = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind my_dk = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // If an exception is thrown, this must be restored. @@ -576,7 +576,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_EnumDef_i impl (this->repo_, this->section_key_); - CORBA_EnumMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_EnumMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -586,7 +586,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->move_pre_process (new_container, my_path.c_str (), new_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -595,7 +595,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_name, new_version, members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -604,14 +604,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_AliasDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; container_impl->create_alias_i (id.in (), new_name, new_version, otype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -620,7 +620,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, container_impl->create_native_i (id.in (), new_name, new_version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -629,14 +629,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ValueBoxDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; container_impl->create_value_box_i (id.in (), new_name, new_version, otype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -645,7 +645,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_StructDef_i impl (this->repo_, this->section_key_); - CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -655,7 +655,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->move_pre_process (new_container, my_path.c_str (), new_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -664,11 +664,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_name, new_version, members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -678,10 +678,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->section_key_); CORBA_IDLType_var disc_type = - impl.discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl.discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_UnionMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_UnionMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Struct @@ -691,7 +691,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->move_pre_process (new_container, my_path.c_str (), new_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -701,11 +701,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_version, disc_type.in (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -715,11 +715,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, container_impl->create_module_i (id.in (), new_name, new_version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -728,7 +728,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ExceptionDef_i impl (this->repo_, this->section_key_); - CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_ExceptionDef_var new_defn = @@ -736,11 +736,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_name, new_version, members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -750,7 +750,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, this->section_key_); CORBA_InterfaceDefSeq_var bases = - impl.base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_InterfaceDef_var new_defn = @@ -758,11 +758,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_name, new_version, bases.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_contents (new_defn.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); break; } @@ -771,10 +771,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_ConstantDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var value = impl.value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var value = impl.value_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; container_impl->create_constant_i (id.in (), @@ -782,7 +782,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_version, type_def.in (), value.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -791,10 +791,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_AttributeDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::AttributeMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::AttributeMode mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Interface) @@ -807,7 +807,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_version, type_def.in (), mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -821,7 +821,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, new_version, type_def.in (), mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -835,20 +835,20 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, TAO_OperationDef_i impl (this->repo_, this->section_key_); - CORBA_IDLType_var result = impl.result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_IDLType_var result = impl.result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::OperationMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::OperationMode mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_ParDescriptionSeq_var params = impl.params_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ParDescriptionSeq_var params = impl.params_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_ExceptionDefSeq_var exceptions = - impl.exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl.exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_ContextIdSeq_var contexts = impl.contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ContextIdSeq_var contexts = impl.contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (container_dk == CORBA::dk_Interface) @@ -864,7 +864,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, params.in (), exceptions.in (), contexts.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -881,7 +881,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container, params.in (), exceptions.in (), contexts.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } @@ -967,12 +967,12 @@ void TAO_Contained_i::move_pre_process (CORBA_Container_ptr container, const char *contained_path, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var container_oid = this->repo_->ir_poa ()->reference_to_id (container - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var container_path = @@ -1027,7 +1027,7 @@ TAO_Contained_i::move_pre_process (CORBA_Container_ptr container, void TAO_Contained_i::move_contents (CORBA_Container_ptr new_container - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; @@ -1070,7 +1070,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container TAO_Contained_i *impl = this->repo_->servant_factory ()->create_contained ( defn_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -1080,13 +1080,13 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container name.c_str (), version.c_str (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } } - CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Specific to InterfaceDef_i and ValueDef_i @@ -1131,7 +1131,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container name.c_str (), version.c_str (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -1174,7 +1174,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container name.c_str (), version.c_str (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.h b/TAO/orbsvcs/IFR_Service/Contained_i.h index 299288402e9..bcc023d9457 100644 --- a/TAO/orbsvcs/IFR_Service/Contained_i.h +++ b/TAO/orbsvcs/IFR_Service/Contained_i.h @@ -51,120 +51,120 @@ public: // Destructor. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); char *id_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void id ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void id_i ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); char *name_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void name ( const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void name_i ( const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); char *version_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void version ( const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void version_i ( const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Container_ptr defined_in_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char *absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); char *absolute_name_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Repository_ptr containing_repository_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. @@ -173,7 +173,7 @@ public: CORBA_Container_ptr new_container, const char *new_name, const char *new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -183,7 +183,7 @@ protected: const char *new_name, const char *new_version, CORBA::Boolean cleanup - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Engine for move() with an extra 'cleanup' @@ -194,7 +194,7 @@ protected: private: CORBA::Boolean name_exists ( const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Check if <name> already exists in our container @@ -209,7 +209,7 @@ private: CORBA_Container_ptr container, const char *contained_path, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Mangle the names of references that are also @@ -219,7 +219,7 @@ private: void move_contents ( CORBA_Container_ptr new_container - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Recursively calls move_i for definitions, diff --git a/TAO/orbsvcs/IFR_Service/Container_i.cpp b/TAO/orbsvcs/IFR_Service/Container_i.cpp index c3bbfcc8e0f..88e98631ddf 100644 --- a/TAO/orbsvcs/IFR_Service/Container_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Container_i.cpp @@ -21,16 +21,16 @@ TAO_Container_i::~TAO_Container_i (void) } void -TAO_Container_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Container_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int index = 0; @@ -77,12 +77,12 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) { TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (entry_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr<TAO_IDLType_i> safety (impl); - CORBA::DefinitionKind def_kind = impl->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = impl->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; switch (def_kind) @@ -95,7 +95,7 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) case CORBA::dk_Fixed: case CORBA::dk_Array: case CORBA::dk_Sequence: - impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; break; default: @@ -146,12 +146,12 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) TAO_Contained_i *impl = this->repo_->servant_factory ()->create_contained (defn_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr<TAO_Contained_i> safety (impl); - impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -163,18 +163,18 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained_ptr TAO_Container_i::lookup (const char *search_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->lookup_i (search_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_Contained_ptr TAO_Container_i::lookup_i (const char *search_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key iter_key; @@ -378,30 +378,30 @@ TAO_Container_i::lookup_i (const char *search_name CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Contained::_nil ()); return CORBA_Contained::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * TAO_Container_i::contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->contents_i (limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (limit_type == CORBA::dk_none) @@ -467,7 +467,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, // Base interfaces - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (def_kind == CORBA::dk_Interface) @@ -483,7 +483,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, path_queue, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -511,12 +511,12 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (next_kind, next_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_Contained_var next_cont = CORBA_Contained::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[j] = next_cont._retn (); @@ -530,7 +530,7 @@ TAO_Container_i::lookup_name (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -539,7 +539,7 @@ TAO_Container_i::lookup_name (const char *search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ContainedSeq * @@ -547,7 +547,7 @@ TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; @@ -559,7 +559,7 @@ TAO_Container_i::lookup_name_i (const char *search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); size_t size = kind_queue.size (); @@ -583,12 +583,12 @@ TAO_Container_i::lookup_name_i (const char *search_name, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (next_kind, next_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_Contained_var next_cont = CORBA_Contained::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = next_cont._retn (); @@ -601,7 +601,7 @@ CORBA_Container::DescriptionSeq * TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); @@ -609,19 +609,19 @@ TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type, return this->describe_contents_i (limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_Container::DescriptionSeq * TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_ContainedSeq_var contents = this->contents_i (limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = contents->length (); @@ -654,7 +654,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, for (CORBA::ULong i = 0; i < ret_len; i++) { oid = this->repo_->ir_poa ()->reference_to_id (contents[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); contained_path = @@ -667,12 +667,12 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, impl = this->repo_->servant_factory ()->create_contained (contained_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr<TAO_Contained_i> safety (impl); - desc = impl->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + desc = impl->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i].contained_object = @@ -690,7 +690,7 @@ CORBA_ModuleDef_ptr TAO_Container_i::create_module (const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ModuleDef::_nil ()); @@ -698,18 +698,18 @@ TAO_Container_i::create_module (const char *id, return this->create_module_i (id, name, version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ModuleDef_ptr TAO_Container_i::create_module_i (const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); if (!legal_op) @@ -717,7 +717,7 @@ TAO_Container_i::create_module_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); if (bad_params) @@ -752,11 +752,11 @@ TAO_Container_i::create_module_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Module, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ()); return CORBA_ModuleDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ConstantDef_ptr @@ -765,7 +765,7 @@ TAO_Container_i::create_constant (const char *id, const char *version, CORBA_IDLType_ptr type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ConstantDef::_nil ()); @@ -775,7 +775,7 @@ TAO_Container_i::create_constant (const char *id, version, type, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ConstantDef_ptr @@ -784,11 +784,11 @@ TAO_Container_i::create_constant_i (const char *id, const char *version, CORBA_IDLType_ptr type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); if (!legal_op) @@ -796,7 +796,7 @@ TAO_Container_i::create_constant_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); if (bad_params) @@ -823,7 +823,7 @@ TAO_Container_i::create_constant_i (const char *id, // Get the path to our type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); CORBA::String_var type_path = @@ -838,7 +838,7 @@ TAO_Container_i::create_constant_i (const char *id, CORBA::TypeCode_var val_tc = value.type (); - CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); switch (kind) @@ -869,11 +869,11 @@ TAO_Container_i::create_constant_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Constant, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ()); return CORBA_ConstantDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StructDef_ptr @@ -881,7 +881,7 @@ TAO_Container_i::create_struct (const char *id, const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_StructDef::_nil ()); @@ -890,7 +890,7 @@ TAO_Container_i::create_struct (const char *id, name, version, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StructDef_ptr @@ -898,11 +898,11 @@ TAO_Container_i::create_struct_i (const char *id, const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (!legal_op) @@ -910,7 +910,7 @@ TAO_Container_i::create_struct_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (bad_params) @@ -963,7 +963,7 @@ TAO_Container_i::create_struct_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); CORBA::String_var member_path = @@ -974,7 +974,7 @@ TAO_Container_i::create_struct_i (const char *id, member_path.in ()); } - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -989,11 +989,11 @@ TAO_Container_i::create_struct_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Struct, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StructDef::_nil ()); return CORBA_StructDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_UnionDef_ptr @@ -1002,7 +1002,7 @@ TAO_Container_i::create_union (const char *id, const char *version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_UnionDef::_nil ()); @@ -1012,7 +1012,7 @@ TAO_Container_i::create_union (const char *id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_UnionDef_ptr @@ -1021,11 +1021,11 @@ TAO_Container_i::create_union_i (const char *id, const char *version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (!legal_op) @@ -1033,7 +1033,7 @@ TAO_Container_i::create_union_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (bad_params) @@ -1059,7 +1059,7 @@ TAO_Container_i::create_union_i (const char *id, // Add a field to hold the path to the discriminator type. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (discriminator_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); CORBA::String_var disc_path = @@ -1099,7 +1099,7 @@ TAO_Container_i::create_union_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); CORBA::String_var member_path = @@ -1111,10 +1111,10 @@ TAO_Container_i::create_union_i (const char *id, this->store_label (member_key, members[i].label - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -1129,11 +1129,11 @@ TAO_Container_i::create_union_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Union, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_UnionDef::_nil ()); return CORBA_UnionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_EnumDef_ptr @@ -1141,7 +1141,7 @@ TAO_Container_i::create_enum (const char *id, const char *name, const char *version, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_EnumDef::_nil ()); @@ -1150,7 +1150,7 @@ TAO_Container_i::create_enum (const char *id, name, version, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_EnumDef_ptr @@ -1158,11 +1158,11 @@ TAO_Container_i::create_enum_i (const char *id, const char *name, const char *version, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (!legal_op) @@ -1170,7 +1170,7 @@ TAO_Container_i::create_enum_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (bad_params) @@ -1215,7 +1215,7 @@ TAO_Container_i::create_enum_i (const char *id, members[i].in ()); } - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); if (def_kind == CORBA::dk_Struct @@ -1230,11 +1230,11 @@ TAO_Container_i::create_enum_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Enum, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_EnumDef::_nil ()); return CORBA_EnumDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AliasDef_ptr @@ -1242,7 +1242,7 @@ TAO_Container_i::create_alias (const char *id, const char *name, const char *version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_AliasDef::_nil ()); @@ -1251,7 +1251,7 @@ TAO_Container_i::create_alias (const char *id, name, version, original_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AliasDef_ptr @@ -1259,11 +1259,11 @@ TAO_Container_i::create_alias_i (const char *id, const char *name, const char *version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); if (!legal_op) @@ -1271,7 +1271,7 @@ TAO_Container_i::create_alias_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); if (bad_params) @@ -1297,7 +1297,7 @@ TAO_Container_i::create_alias_i (const char *id, // Get the path to our original type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); CORBA::String_var unalias_path = @@ -1311,11 +1311,11 @@ TAO_Container_i::create_alias_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Alias, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AliasDef::_nil ()); return CORBA_AliasDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_InterfaceDef_ptr @@ -1323,7 +1323,7 @@ TAO_Container_i::create_interface (const char *id, const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); @@ -1332,7 +1332,7 @@ TAO_Container_i::create_interface (const char *id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_InterfaceDef_ptr @@ -1340,11 +1340,11 @@ TAO_Container_i::create_interface_i (const char *id, const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (!legal_op) @@ -1352,7 +1352,7 @@ TAO_Container_i::create_interface_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); if (bad_params) @@ -1392,7 +1392,7 @@ TAO_Container_i::create_interface_i (const char *id, { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1410,11 +1410,11 @@ TAO_Container_i::create_interface_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Interface, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ()); return CORBA_InterfaceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ValueDef_ptr @@ -1428,7 +1428,7 @@ TAO_Container_i::create_value (const char *id, const CORBA_ValueDefSeq &abstract_base_values, const CORBA_InterfaceDefSeq &supported_interfaces, const CORBA_InitializerSeq &initializers - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueDef::_nil ()); @@ -1443,7 +1443,7 @@ TAO_Container_i::create_value (const char *id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ValueDef_ptr @@ -1457,7 +1457,7 @@ TAO_Container_i::create_value_i (const char * /* id */, const CORBA_ValueDefSeq & /* abstract_base_values */, const CORBA_InterfaceDefSeq & /* supported_interfaces */, const CORBA_InitializerSeq & /* initializers */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -1469,7 +1469,7 @@ TAO_Container_i::create_value_box (const char *id, const char *name, const char *version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueBoxDef::_nil ()); @@ -1478,7 +1478,7 @@ TAO_Container_i::create_value_box (const char *id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ValueBoxDef_ptr @@ -1486,11 +1486,11 @@ TAO_Container_i::create_value_box_i (const char *id, const char *name, const char *version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL ) + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); if (!legal_op) @@ -1498,7 +1498,7 @@ TAO_Container_i::create_value_box_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); if (bad_params) @@ -1524,7 +1524,7 @@ TAO_Container_i::create_value_box_i (const char *id, // Get the path to our original type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); CORBA::String_var boxed_path = @@ -1538,11 +1538,11 @@ TAO_Container_i::create_value_box_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_ValueBox, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); return CORBA_ValueBoxDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ExceptionDef_ptr @@ -1550,7 +1550,7 @@ TAO_Container_i::create_exception (const char *id, const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ExceptionDef::_nil ()); @@ -1559,7 +1559,7 @@ TAO_Container_i::create_exception (const char *id, name, version, members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ExceptionDef_ptr @@ -1567,11 +1567,11 @@ TAO_Container_i::create_exception_i (const char *id, const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); if (!legal_op) @@ -1579,7 +1579,7 @@ TAO_Container_i::create_exception_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); if (bad_params) @@ -1630,7 +1630,7 @@ TAO_Container_i::create_exception_i (const char *id, PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); CORBA::String_var member_path = @@ -1645,18 +1645,18 @@ TAO_Container_i::create_exception_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ()); return CORBA_ExceptionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_NativeDef_ptr TAO_Container_i::create_native (const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_NativeDef::_nil ()); @@ -1664,18 +1664,18 @@ TAO_Container_i::create_native (const char *id, return this->create_native_i (id, name, version - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_NativeDef_ptr TAO_Container_i::create_native_i (const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); if (!legal_op) @@ -1683,7 +1683,7 @@ TAO_Container_i::create_native_i (const char *id, CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); if (bad_params) @@ -1710,11 +1710,11 @@ TAO_Container_i::create_native_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Native, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_NativeDef::_nil ()); return CORBA_NativeDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AbstractInterfaceDef_ptr @@ -1723,7 +1723,7 @@ TAO_Container_i::create_abstract_interface ( const char *name, const char *version, const CORBA_AbstractInterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1733,7 +1733,7 @@ TAO_Container_i::create_abstract_interface ( name, version, base_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AbstractInterfaceDef_ptr @@ -1742,13 +1742,13 @@ TAO_Container_i::create_abstract_interface_i ( const char *name, const char *version, const CORBA_AbstractInterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container ( CORBA::dk_AbstractInterface - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); @@ -1757,7 +1757,7 @@ TAO_Container_i::create_abstract_interface_i ( CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); if (bad_params) @@ -1797,7 +1797,7 @@ TAO_Container_i::create_abstract_interface_i ( { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1815,11 +1815,11 @@ TAO_Container_i::create_abstract_interface_i ( CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_AbstractInterface, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ()); return CORBA_AbstractInterfaceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_LocalInterfaceDef_ptr @@ -1828,7 +1828,7 @@ TAO_Container_i::create_local_interface ( const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1838,7 +1838,7 @@ TAO_Container_i::create_local_interface ( name, version, base_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_LocalInterfaceDef_ptr @@ -1847,12 +1847,12 @@ TAO_Container_i::create_local_interface_i ( const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); if (!legal_op) @@ -1860,7 +1860,7 @@ TAO_Container_i::create_local_interface_i ( CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); if (bad_params) @@ -1900,7 +1900,7 @@ TAO_Container_i::create_local_interface_i ( { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); CORBA::String_var inherited_path = @@ -1918,16 +1918,16 @@ TAO_Container_i::create_local_interface_i ( CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_LocalInterface, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ()); return CORBA_LocalInterfaceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_Container_i::name_exists (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { int index = 0; @@ -2003,7 +2003,7 @@ TAO_Container_i::name_exists (const char *name } // If we are an interface, check the inherited members. - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (def_kind == CORBA::dk_Interface) @@ -2060,7 +2060,7 @@ TAO_Container_i::lookup_name_recursive ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_Configuration_Section_Key defns_key; @@ -2125,7 +2125,7 @@ TAO_Container_i::lookup_name_recursive ( TAO_Container_i *impl = this->repo_->servant_factory ()->create_container ( defn_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -2143,13 +2143,13 @@ TAO_Container_i::lookup_name_recursive ( : levels_to_search - 1, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } } - CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value) @@ -2378,7 +2378,7 @@ TAO_Container_i::lookup_op ( CORBA::Boolean TAO_Container_i::id_exists (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // The repo id must not already exist. @@ -2400,16 +2400,16 @@ TAO_Container_i::id_exists (const char *id CORBA::Boolean TAO_Container_i::pre_exist (const char *id, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::Boolean exist = this->id_exists (id TAO_ENV_ARG_PARAMETER); + CORBA::Boolean exist = this->id_exists (id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (exist) return 1; - return name_exists (name TAO_ENV_ARG_PARAMETER); + return name_exists (name ACE_ENV_ARG_PARAMETER); } ACE_TString @@ -2516,10 +2516,10 @@ TAO_Container_i::create_common ( CORBA::Boolean TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::DefinitionKind my_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind my_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int error_flag = 0; @@ -2579,12 +2579,12 @@ TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind void TAO_Container_i::store_label (ACE_Configuration_Section_Key key, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var tc = value.type (); - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_InputCDR cdr (value._tao_get_cdr (), diff --git a/TAO/orbsvcs/IFR_Service/Container_i.h b/TAO/orbsvcs/IFR_Service/Container_i.h index df454997d72..e3435b72c31 100644 --- a/TAO/orbsvcs/IFR_Service/Container_i.h +++ b/TAO/orbsvcs/IFR_Service/Container_i.h @@ -54,39 +54,39 @@ public: // Destructor. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove our contents. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained_ptr lookup ( const char *search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Contained_ptr lookup_i ( const char *search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ContainedSeq *contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ContainedSeq *contents_i ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -95,7 +95,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -104,7 +104,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -112,7 +112,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -120,7 +120,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -128,7 +128,7 @@ public: const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -136,7 +136,7 @@ public: const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -146,7 +146,7 @@ public: const char *version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -156,7 +156,7 @@ public: const char *version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -165,7 +165,7 @@ public: const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -174,7 +174,7 @@ public: const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -184,7 +184,7 @@ public: const char *version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -194,7 +194,7 @@ public: const char *version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -203,7 +203,7 @@ public: const char *name, const char *version, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -212,7 +212,7 @@ public: const char *name, const char *version, const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -221,7 +221,7 @@ public: const char *name, const char *version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -230,7 +230,7 @@ public: const char *name, const char *version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -239,7 +239,7 @@ public: const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -248,7 +248,7 @@ public: const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -263,7 +263,7 @@ public: const CORBA_ValueDefSeq &abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq &initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -278,7 +278,7 @@ public: const CORBA_ValueDefSeq &abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq &initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -287,7 +287,7 @@ public: const char *name, const char *version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -296,7 +296,7 @@ public: const char *name, const char *version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -305,7 +305,7 @@ public: const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -314,7 +314,7 @@ public: const char *name, const char *version, const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -322,7 +322,7 @@ public: const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -330,7 +330,7 @@ public: const char *id, const char *name, const char *version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -339,7 +339,7 @@ public: const char *name, const char *version, const CORBA_AbstractInterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -348,7 +348,7 @@ public: const char *name, const char *version, const CORBA_AbstractInterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -357,7 +357,7 @@ public: const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -366,13 +366,13 @@ public: const char *name, const char *version, const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean name_exists ( const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Checks for local existence of <name>. @@ -381,7 +381,7 @@ protected: void store_label ( ACE_Configuration_Section_Key key, const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Store a union member's label value. @@ -389,7 +389,7 @@ protected: CORBA::Boolean pre_exist ( const char *id, const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Bundles id_exists and name_exists together. @@ -427,19 +427,19 @@ private: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean id_exists ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Checks for global existence of the repo id. CORBA::Boolean valid_container ( const CORBA::DefinitionKind op_kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Is this operation valid for this container type? diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp index eac6599262e..97ad175d7ad 100644 --- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp @@ -19,39 +19,39 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void) } CORBA::DefinitionKind -TAO_EmitsDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EmitsDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Emits; } -void -TAO_EmitsDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_EmitsDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_EmitsDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_EmitsDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_EmitsDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_EmitsDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_EmitsDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_EmitsDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h index 4759d541ab8..5b7141e3ee8 100644 --- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h @@ -51,30 +51,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp index 04ab433cb5b..288a13fdd66 100644 --- a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp @@ -21,23 +21,23 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void) } CORBA::DefinitionKind -TAO_EnumDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EnumDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Enum; } CORBA::TypeCode_ptr -TAO_EnumDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_EnumDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_EnumDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -50,26 +50,26 @@ TAO_EnumDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_EnumMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_EnumMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_enum_tc (id.c_str (), name.c_str (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_EnumMemberSeq * -TAO_EnumDef_i::members (TAO_ENV_SINGLE_ARG_DECL) +TAO_EnumDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_EnumMemberSeq * -TAO_EnumDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; @@ -107,18 +107,18 @@ TAO_EnumDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->members_i (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.h b/TAO/orbsvcs/IFR_Service/EnumDef_i.h index ba0aefb5c6f..202696fe9e0 100644 --- a/TAO/orbsvcs/IFR_Service/EnumDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.h @@ -51,42 +51,42 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_EnumMemberSeq *members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_EnumMemberSeq *members_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( const CORBA_EnumMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp index b7e4549e081..92500cea21e 100644 --- a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp @@ -18,32 +18,32 @@ TAO_EventDef_i::~TAO_EventDef_i (void) } void -TAO_EventDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_EventDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EventDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_EventDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_EventDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_EventDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_EventDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_EventDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -52,18 +52,18 @@ TAO_EventDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A CORBA::Boolean TAO_EventDef_i::is_a (const char *event_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (event_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_EventDef_i::is_a_i (const char * /* event_id */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -71,16 +71,16 @@ TAO_EventDef_i::is_a_i (const char * /* event_id */ } CORBA_ValueDef_ptr -TAO_EventDef_i::event (TAO_ENV_SINGLE_ARG_DECL) +TAO_EventDef_i::event (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); - return this->event_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->event_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDef_ptr -TAO_EventDef_i::event_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_EventDef_i::event_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.h b/TAO/orbsvcs/IFR_Service/EventDef_i.h index e86186fc725..67b0fe1884f 100644 --- a/TAO/orbsvcs/IFR_Service/EventDef_i.h +++ b/TAO/orbsvcs/IFR_Service/EventDef_i.h @@ -51,47 +51,47 @@ public: // Destructor virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::Boolean is_a ( const char *event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDef_ptr event_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp index 3bffdcc71d6..6dc98d5c663 100644 --- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp @@ -24,45 +24,45 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void) } CORBA::DefinitionKind -TAO_ExceptionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ExceptionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Exception; } void -TAO_ExceptionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ExceptionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA_Contained::Description * -TAO_ExceptionDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -73,15 +73,15 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_ExceptionDescription ed; - ed.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ed.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - ed.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ed.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -92,10 +92,10 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) ed.defined_in = container_id.c_str (); - ed.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ed.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - ed.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ed.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= ed; @@ -104,16 +104,16 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -126,26 +126,26 @@ TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_exception_tc (id.c_str (), name.c_str (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_ExceptionDef_i::members (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; @@ -240,11 +240,11 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) obj = this->repo_->servant_factory ()->create_objref (kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[k].type_def = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->repo_->config ()->expand_path (this->repo_->root_key (), @@ -254,12 +254,12 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) impl = this->repo_->servant_factory ()->create_idltype (member_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr<TAO_IDLType_i> safety (impl); - retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -268,22 +268,22 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->members_i (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count = members.length (); @@ -317,7 +317,7 @@ TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var path = diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h index 0a1d55cad82..d2f882f1a8a 100644 --- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h @@ -52,64 +52,64 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_StructMemberSeq *members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_StructMemberSeq *members_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp index 597ad4f0235..aa04971500c 100644 --- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp @@ -21,39 +21,39 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void) } CORBA::DefinitionKind -TAO_FactoryDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FactoryDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Factory; } -void -TAO_FactoryDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_FactoryDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_FactoryDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_FactoryDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_FactoryDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_FactoryDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_FactoryDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) +TAO_FactoryDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h index 09718358b0c..6e5efac51a8 100644 --- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h @@ -50,30 +50,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp index a8a16e4178b..833621ce7e1 100644 --- a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp @@ -19,39 +19,39 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void) } CORBA::DefinitionKind -TAO_FinderDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FinderDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Finder; } -void -TAO_FinderDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_FinderDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_FinderDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_FinderDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_FinderDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_FinderDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_FinderDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) +TAO_FinderDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.h b/TAO/orbsvcs/IFR_Service/FinderDef_i.h index ea9d60edcfa..a8cd01fe2c4 100644 --- a/TAO/orbsvcs/IFR_Service/FinderDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.h @@ -50,30 +50,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp index 42ccaf54ec2..fcf7f2e05f0 100644 --- a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp @@ -18,39 +18,39 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void) } CORBA::DefinitionKind -TAO_FixedDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FixedDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Fixed; } void -TAO_FixedDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FixedDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_FixedDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::TypeCode_ptr -TAO_FixedDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_FixedDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_FixedDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -58,16 +58,16 @@ TAO_FixedDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_P } CORBA::UShort -TAO_FixedDef_i::digits (TAO_ENV_SINGLE_ARG_DECL) +TAO_FixedDef_i::digits (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->digits_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->digits_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::UShort -TAO_FixedDef_i::digits_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::digits_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -76,34 +76,34 @@ TAO_FixedDef_i::digits_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG void TAO_FixedDef_i::digits (CORBA::UShort digits - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->digits_i (digits - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Short -TAO_FixedDef_i::scale (TAO_ENV_SINGLE_ARG_DECL) +TAO_FixedDef_i::scale (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->scale_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->scale_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Short -TAO_FixedDef_i::scale_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_FixedDef_i::scale_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -112,18 +112,18 @@ TAO_FixedDef_i::scale_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_ void TAO_FixedDef_i::scale (CORBA::Short scale - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->scale_i (scale - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_FixedDef_i::scale_i (CORBA::Short /* scale */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.h b/TAO/orbsvcs/IFR_Service/FixedDef_i.h index 6ea79f0cc0b..7c264dc2f5f 100644 --- a/TAO/orbsvcs/IFR_Service/FixedDef_i.h +++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.h @@ -50,75 +50,75 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::UShort digits ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::UShort digits_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void digits_i ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Short scale ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Short scale_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void scale ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void scale_i ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp index 77617ed7ab9..966b10f2168 100644 --- a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp @@ -21,39 +21,39 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void) } CORBA::DefinitionKind -TAO_HomeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_HomeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Home; } void -TAO_HomeDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_HomeDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_HomeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_HomeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -61,16 +61,16 @@ TAO_HomeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_AR } CORBA::TypeCode_ptr -TAO_HomeDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_HomeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -78,16 +78,16 @@ TAO_HomeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PA } IR::HomeDef_ptr -TAO_HomeDef_i::base_home (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::base_home (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (IR::HomeDef::_nil ()); - return this->base_home_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->base_home_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::HomeDef_ptr -TAO_HomeDef_i::base_home_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -95,16 +95,16 @@ TAO_HomeDef_i::base_home_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A } IR::ComponentDef_ptr -TAO_HomeDef_i::managed_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::managed_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ()); - return this->managed_component_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->managed_component_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::ComponentDef_ptr -TAO_HomeDef_i::managed_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -112,16 +112,16 @@ TAO_HomeDef_i::managed_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_ } IR::PrimaryKeyDef_ptr -TAO_HomeDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (IR::PrimaryKeyDef::_nil ()); - return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::PrimaryKeyDef_ptr -TAO_HomeDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -129,16 +129,16 @@ TAO_HomeDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE } IR::FactoryDefSeq * -TAO_HomeDef_i::factories (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::factories (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->factories_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->factories_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::FactoryDefSeq * -TAO_HomeDef_i::factories_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::factories_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -146,16 +146,16 @@ TAO_HomeDef_i::factories_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A } IR::FinderDefSeq * -TAO_HomeDef_i::finders (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::finders (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->finders_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->finders_i (ACE_ENV_SINGLE_ARG_PARAMETER); } IR::FinderDefSeq * -TAO_HomeDef_i::finders_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::finders_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -163,16 +163,16 @@ TAO_HomeDef_i::finders_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG } CORBA::Boolean -TAO_HomeDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL) +TAO_HomeDef_i::is_basic (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_basic_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_basic_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_HomeDef_i::is_basic_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_HomeDef_i::is_basic_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -184,7 +184,7 @@ TAO_HomeDef_i::create_primary_key (const char *id, const char *name, const char *version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::PrimaryKeyDef::_nil ()); @@ -193,7 +193,7 @@ TAO_HomeDef_i::create_primary_key (const char *id, name, version, primary_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::PrimaryKeyDef_ptr @@ -201,7 +201,7 @@ TAO_HomeDef_i::create_primary_key_i (const char * /* id */, const char * /* name */, const char * /* version */, CORBA_ValueDef_ptr /* primary_key */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -214,7 +214,7 @@ TAO_HomeDef_i::create_factory (const char *id, const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::FactoryDef::_nil ()); @@ -224,7 +224,7 @@ TAO_HomeDef_i::create_factory (const char *id, version, params, exceptions - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::FactoryDef_ptr @@ -234,7 +234,7 @@ TAO_HomeDef_i::create_factory_i ( const char * /* version */, const CORBA_ParDescriptionSeq & /* params */, const CORBA_ExceptionDefSeq & /* exceptions */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -248,7 +248,7 @@ TAO_HomeDef_i::create_finder (const char *id, const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (IR::FinderDef::_nil ()); @@ -258,7 +258,7 @@ TAO_HomeDef_i::create_finder (const char *id, version, params, exceptions - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IR::FinderDef_ptr @@ -268,7 +268,7 @@ TAO_HomeDef_i::create_finder_i ( const char * /* version */, const CORBA_ParDescriptionSeq & /* params */, const CORBA_ExceptionDefSeq & /* exceptions */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.h b/TAO/orbsvcs/IFR_Service/HomeDef_i.h index 473bf92c399..d204facf67e 100644 --- a/TAO/orbsvcs/IFR_Service/HomeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.h @@ -52,103 +52,103 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual IR::HomeDef_ptr base_home ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::HomeDef_ptr base_home_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::ComponentDef_ptr managed_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::ComponentDef_ptr managed_component_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::PrimaryKeyDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::PrimaryKeyDef_ptr primary_key_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::FactoryDefSeq *factories ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::FactoryDefSeq *factories_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IR::FinderDefSeq *finders ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); IR::FinderDefSeq *finders_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_basic_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -157,7 +157,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -166,7 +166,7 @@ public: const char *name, const char *version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -176,7 +176,7 @@ public: const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -186,7 +186,7 @@ public: const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -196,7 +196,7 @@ public: const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -206,7 +206,7 @@ public: const char *version, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/IDLType_i.h b/TAO/orbsvcs/IFR_Service/IDLType_i.h index 3090d1cf163..faac04d8072 100644 --- a/TAO/orbsvcs/IFR_Service/IDLType_i.h +++ b/TAO/orbsvcs/IFR_Service/IDLType_i.h @@ -54,13 +54,13 @@ public: // Destructor. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Defined in concrete classes. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Defined in concrete classes. diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp index 571fa45f9c4..c45f8003fce 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp @@ -163,31 +163,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::DefinitionKind result); @@ -205,44 +205,44 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_I TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_IRObject *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -254,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -264,10 +264,10 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -284,31 +284,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -325,44 +325,44 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObje TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_IRObject *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -370,7 +370,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -380,10 +380,10 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -416,17 +416,17 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::~_TAO_CORBA_IRObject_Strategized_P _TAO_CORBA_IRObject_Proxy_Impl& _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy ( ::CORBA_IRObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -436,7 +436,7 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -506,7 +506,7 @@ _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl ( CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -522,7 +522,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( _collocated_tao_target_->_object_key (), "def_kind", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -531,13 +531,13 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( "IDL:omg.org/CORBA/IRObject:1.0" ) )->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -551,7 +551,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( _collocated_tao_target_->_object_key (), "destroy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -560,7 +560,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( "IDL:omg.org/CORBA/IRObject:1.0" ) )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -589,7 +589,7 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject *_tao_impl = @@ -610,18 +610,18 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -629,7 +629,7 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( CORBA::DefinitionKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -637,12 +637,12 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -670,7 +670,7 @@ void POA_CORBA_IRObject::destroy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject *_tao_impl = @@ -691,24 +691,24 @@ void POA_CORBA_IRObject::destroy_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -716,12 +716,12 @@ void POA_CORBA_IRObject::destroy_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -742,7 +742,7 @@ void POA_CORBA_IRObject::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -752,7 +752,7 @@ void POA_CORBA_IRObject::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -765,11 +765,11 @@ void POA_CORBA_IRObject::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -782,7 +782,7 @@ void POA_CORBA_IRObject::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference; @@ -801,7 +801,7 @@ void POA_CORBA_IRObject::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -828,10 +828,10 @@ void POA_CORBA_IRObject::_interface_skel ( CORBA::Boolean POA_CORBA_IRObject::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -853,12 +853,12 @@ void* POA_CORBA_IRObject::_downcast ( return 0; } -void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -868,9 +868,9 @@ const char* POA_CORBA_IRObject::_interface_repository_id (void) const } CORBA_IRObject* -POA_CORBA_IRObject::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_IRObject::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1036,31 +1036,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1078,44 +1078,44 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contai TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1127,7 +1127,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1137,10 +1137,10 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_id_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1158,31 +1158,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1201,7 +1201,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, const char * id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1209,12 +1209,12 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1230,25 +1230,25 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1256,7 +1256,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1266,10 +1266,10 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_id_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestInfo @@ -1279,31 +1279,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1321,44 +1321,44 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Cont TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1370,7 +1370,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1380,10 +1380,10 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_name_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1401,31 +1401,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1444,7 +1444,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, const char * name - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1452,12 +1452,12 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1473,25 +1473,25 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1499,7 +1499,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1509,10 +1509,10 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_name_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerRequestInfo @@ -1522,31 +1522,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1564,44 +1564,44 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1613,7 +1613,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1623,10 +1623,10 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_version_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1644,31 +1644,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1687,7 +1687,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1695,12 +1695,12 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1716,25 +1716,25 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1742,7 +1742,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1752,10 +1752,10 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_version_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRequestInfo @@ -1765,31 +1765,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Container_ptr result); @@ -1807,44 +1807,44 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORB TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1856,7 +1856,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1866,10 +1866,10 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1886,31 +1886,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (char * result); @@ -1928,44 +1928,44 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1977,7 +1977,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1987,10 +1987,10 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2007,31 +2007,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Repository_ptr result); @@ -2049,44 +2049,44 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerReque TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2098,7 +2098,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV char * TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2108,10 +2108,10 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2128,31 +2128,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Contained::Description * result); @@ -2170,44 +2170,44 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Cont TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_describe::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2219,7 +2219,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2229,10 +2229,10 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_describe::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2252,31 +2252,31 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2299,7 +2299,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2309,12 +2309,12 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_move::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2336,25 +2336,25 @@ TAO_ServerRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2362,7 +2362,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2372,10 +2372,10 @@ TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_move::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -2408,17 +2408,17 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::~_TAO_CORBA_Contained_Strategized _TAO_CORBA_Contained_Proxy_Impl& _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy ( ::CORBA_Contained *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2428,7 +2428,7 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2498,7 +2498,7 @@ _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2514,7 +2514,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( _collocated_tao_target_->_object_key (), "id", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2523,14 +2523,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( "IDL:omg.org/CORBA/Contained:1.0" ) )->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2544,7 +2544,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( _collocated_tao_target_->_object_key (), "id", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2554,14 +2554,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( ) )->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2577,7 +2577,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( _collocated_tao_target_->_object_key (), "name", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2586,14 +2586,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( "IDL:omg.org/CORBA/Contained:1.0" ) )->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( CORBA_Object *_collocated_tao_target_, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2607,7 +2607,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( _collocated_tao_target_->_object_key (), "name", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2617,14 +2617,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( ) )->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2640,7 +2640,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( _collocated_tao_target_->_object_key (), "version", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2649,14 +2649,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( "IDL:omg.org/CORBA/Contained:1.0" ) )->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( CORBA_Object *_collocated_tao_target_, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2670,7 +2670,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( _collocated_tao_target_->_object_key (), "version", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2680,14 +2680,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( ) )->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2703,7 +2703,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( _collocated_tao_target_->_object_key (), "defined_in", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2712,13 +2712,13 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( "IDL:omg.org/CORBA/Contained:1.0" ) )->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2734,7 +2734,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( _collocated_tao_target_->_object_key (), "absolute_name", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2743,13 +2743,13 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( "IDL:omg.org/CORBA/Contained:1.0" ) )->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_repository ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2765,7 +2765,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit _collocated_tao_target_->_object_key (), "containing_repository", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2774,13 +2774,13 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit "IDL:omg.org/CORBA/Contained:1.0" ) )->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2796,7 +2796,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe _collocated_tao_target_->_object_key (), "describe", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2805,7 +2805,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe "IDL:omg.org/CORBA/Contained:1.0" ) )->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2814,7 +2814,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2828,7 +2828,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( _collocated_tao_target_->_object_key (), "move", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2840,7 +2840,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2870,7 +2870,7 @@ void POA_CORBA_Contained::_get_id_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -2891,18 +2891,18 @@ void POA_CORBA_Contained::_get_id_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2911,7 +2911,7 @@ void POA_CORBA_Contained::_get_id_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2919,12 +2919,12 @@ void POA_CORBA_Contained::_get_id_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2952,7 +2952,7 @@ void POA_CORBA_Contained::_set_id_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2981,25 +2981,25 @@ void POA_CORBA_Contained::_set_id_skel ( _tao_upcall, _tao_impl, id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->id ( id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3007,12 +3007,12 @@ void POA_CORBA_Contained::_set_id_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3033,7 +3033,7 @@ void POA_CORBA_Contained::_get_name_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3054,18 +3054,18 @@ void POA_CORBA_Contained::_get_name_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3074,7 +3074,7 @@ void POA_CORBA_Contained::_get_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3082,12 +3082,12 @@ void POA_CORBA_Contained::_get_name_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3115,7 +3115,7 @@ void POA_CORBA_Contained::_set_name_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3144,25 +3144,25 @@ void POA_CORBA_Contained::_set_name_skel ( _tao_upcall, _tao_impl, name.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->name ( name.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3170,12 +3170,12 @@ void POA_CORBA_Contained::_set_name_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3196,7 +3196,7 @@ void POA_CORBA_Contained::_get_version_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3217,18 +3217,18 @@ void POA_CORBA_Contained::_get_version_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3237,7 +3237,7 @@ void POA_CORBA_Contained::_get_version_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3245,12 +3245,12 @@ void POA_CORBA_Contained::_get_version_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3278,7 +3278,7 @@ void POA_CORBA_Contained::_set_version_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3307,25 +3307,25 @@ void POA_CORBA_Contained::_set_version_skel ( _tao_upcall, _tao_impl, version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->version ( version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3333,12 +3333,12 @@ void POA_CORBA_Contained::_set_version_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3359,7 +3359,7 @@ void POA_CORBA_Contained::_get_defined_in_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3380,18 +3380,18 @@ void POA_CORBA_Contained::_get_defined_in_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3400,7 +3400,7 @@ void POA_CORBA_Contained::_get_defined_in_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3408,12 +3408,12 @@ void POA_CORBA_Contained::_get_defined_in_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3441,7 +3441,7 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3462,18 +3462,18 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3482,7 +3482,7 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3490,12 +3490,12 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3523,7 +3523,7 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3544,18 +3544,18 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3564,7 +3564,7 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3572,12 +3572,12 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3605,7 +3605,7 @@ void POA_CORBA_Contained::describe_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = @@ -3626,18 +3626,18 @@ void POA_CORBA_Contained::describe_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3646,7 +3646,7 @@ void POA_CORBA_Contained::describe_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3654,12 +3654,12 @@ void POA_CORBA_Contained::describe_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3687,7 +3687,7 @@ void POA_CORBA_Contained::move_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3722,12 +3722,12 @@ void POA_CORBA_Contained::move_skel ( new_container.in (), new_name.in (), new_version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -3736,13 +3736,13 @@ void POA_CORBA_Contained::move_skel ( new_container.in (), new_name.in (), new_version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3750,12 +3750,12 @@ void POA_CORBA_Contained::move_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3776,7 +3776,7 @@ void POA_CORBA_Contained::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3786,7 +3786,7 @@ void POA_CORBA_Contained::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3799,11 +3799,11 @@ void POA_CORBA_Contained::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3816,7 +3816,7 @@ void POA_CORBA_Contained::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference; @@ -3835,7 +3835,7 @@ void POA_CORBA_Contained::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -3862,10 +3862,10 @@ void POA_CORBA_Contained::_interface_skel ( CORBA::Boolean POA_CORBA_Contained::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -3890,12 +3890,12 @@ void* POA_CORBA_Contained::_downcast ( return 0; } -void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3905,9 +3905,9 @@ const char* POA_CORBA_Contained::_interface_repository_id (void) const } CORBA_Contained* -POA_CORBA_Contained::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Contained::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -4080,31 +4080,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl , const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Contained_ptr result); @@ -4124,7 +4124,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Container *tao_impl, const char * search_name - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4132,12 +4132,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4153,25 +4153,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4183,7 +4183,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4193,10 +4193,10 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_lookup::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4215,31 +4215,31 @@ public: , CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ContainedSeq * result); @@ -4261,7 +4261,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont POA_CORBA_Container *tao_impl, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4270,12 +4270,12 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_contents::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4294,25 +4294,25 @@ TAO_ServerRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_contents::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4324,7 +4324,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4334,10 +4334,10 @@ TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_contents::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4358,31 +4358,31 @@ public: const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ContainedSeq * result); @@ -4408,7 +4408,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4419,12 +4419,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4449,25 +4449,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4479,7 +4479,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4489,10 +4489,10 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4512,31 +4512,31 @@ public: CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, const CORBA::Long & max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Container::DescriptionSeq * result); @@ -4560,7 +4560,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, const CORBA::Long & max_returned_objs - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4570,12 +4570,12 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4597,25 +4597,25 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4627,7 +4627,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4637,10 +4637,10 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4660,31 +4660,31 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ModuleDef_ptr result); @@ -4708,7 +4708,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4718,12 +4718,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4745,25 +4745,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_module::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4775,7 +4775,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4785,10 +4785,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_module::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4810,31 +4810,31 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ConstantDef_ptr result); @@ -4862,7 +4862,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4874,12 +4874,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4907,25 +4907,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_constant::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4937,7 +4937,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4947,10 +4947,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_constant::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4971,31 +4971,31 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_StructDef_ptr result); @@ -5021,7 +5021,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5032,12 +5032,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5062,25 +5062,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_struct::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5092,7 +5092,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5102,10 +5102,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_struct::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5127,31 +5127,31 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_UnionDef_ptr result); @@ -5179,7 +5179,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_ const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5191,12 +5191,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5224,25 +5224,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_union::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5254,7 +5254,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5264,10 +5264,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_union::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5288,31 +5288,31 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_EnumDef_ptr result); @@ -5338,7 +5338,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5349,12 +5349,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5379,25 +5379,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_enum::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5409,7 +5409,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5419,10 +5419,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_enum::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5443,31 +5443,31 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_AliasDef_ptr result); @@ -5493,7 +5493,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_ const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5504,12 +5504,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5534,25 +5534,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_alias::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5564,7 +5564,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5574,10 +5574,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_alias::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5598,31 +5598,31 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDef_ptr result); @@ -5648,7 +5648,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5659,12 +5659,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5689,25 +5689,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5719,7 +5719,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5729,10 +5729,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_interface::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5759,31 +5759,31 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef_ptr result); @@ -5821,7 +5821,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_ const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5838,12 +5838,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5886,25 +5886,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5916,7 +5916,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5926,10 +5926,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_value::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5950,31 +5950,31 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueBoxDef_ptr result); @@ -6000,7 +6000,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6011,12 +6011,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6041,25 +6041,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6071,7 +6071,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6081,10 +6081,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6105,31 +6105,31 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ExceptionDef_ptr result); @@ -6155,7 +6155,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6166,12 +6166,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6196,25 +6196,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_exception::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6226,7 +6226,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6236,10 +6236,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_exception::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6259,31 +6259,31 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_NativeDef_ptr result); @@ -6307,7 +6307,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6317,12 +6317,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6344,25 +6344,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_native::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6374,7 +6374,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6384,10 +6384,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_native::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6408,31 +6408,31 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_AbstractInterfaceDef_ptr result); @@ -6458,7 +6458,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6469,12 +6469,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6499,25 +6499,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6529,7 +6529,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV char * TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6539,10 +6539,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6563,31 +6563,31 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_LocalInterfaceDef_ptr result); @@ -6613,7 +6613,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6624,12 +6624,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6654,25 +6654,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6684,7 +6684,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6694,10 +6694,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6737,17 +6737,17 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::~_TAO_CORBA_Container_Strategized _TAO_CORBA_Container_Proxy_Impl& _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy ( ::CORBA_Container *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -6757,7 +6757,7 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -6828,7 +6828,7 @@ _TAO_CORBA_Container_ThruPOA_Proxy_Impl::_TAO_CORBA_Container_ThruPOA_Proxy_Impl CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( CORBA_Object *_collocated_tao_target_, const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6844,7 +6844,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( _collocated_tao_target_->_object_key (), "lookup", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6854,7 +6854,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( ) )->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6862,7 +6862,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6878,7 +6878,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( _collocated_tao_target_->_object_key (), "contents", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6889,7 +6889,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( )->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6899,7 +6899,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6915,7 +6915,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( _collocated_tao_target_->_object_key (), "lookup_name", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6928,7 +6928,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6937,7 +6937,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6953,7 +6953,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr _collocated_tao_target_->_object_key (), "describe_contents", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6965,7 +6965,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6974,7 +6974,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6990,7 +6990,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( _collocated_tao_target_->_object_key (), "create_module", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7002,7 +7002,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7013,7 +7013,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7029,7 +7029,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( _collocated_tao_target_->_object_key (), "create_constant", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7043,7 +7043,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7053,7 +7053,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7069,7 +7069,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( _collocated_tao_target_->_object_key (), "create_struct", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7082,7 +7082,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7093,7 +7093,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7109,7 +7109,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( _collocated_tao_target_->_object_key (), "create_union", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7123,7 +7123,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7133,7 +7133,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7149,7 +7149,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( _collocated_tao_target_->_object_key (), "create_enum", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7162,7 +7162,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7172,7 +7172,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7188,7 +7188,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( _collocated_tao_target_->_object_key (), "create_alias", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7201,7 +7201,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7211,7 +7211,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7227,7 +7227,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface _collocated_tao_target_->_object_key (), "create_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7240,7 +7240,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7256,7 +7256,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7272,7 +7272,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( _collocated_tao_target_->_object_key (), "create_value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7291,7 +7291,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7301,7 +7301,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7317,7 +7317,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box _collocated_tao_target_->_object_key (), "create_value_box", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7330,7 +7330,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7340,7 +7340,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7356,7 +7356,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception _collocated_tao_target_->_object_key (), "create_exception", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7369,7 +7369,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7378,7 +7378,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7394,7 +7394,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( _collocated_tao_target_->_object_key (), "create_native", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7406,7 +7406,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7416,7 +7416,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7432,7 +7432,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a _collocated_tao_target_->_object_key (), "create_abstract_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7445,7 +7445,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7455,7 +7455,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7471,7 +7471,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca _collocated_tao_target_->_object_key (), "create_local_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7484,7 +7484,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7513,7 +7513,7 @@ void POA_CORBA_Container::lookup_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7542,19 +7542,19 @@ void POA_CORBA_Container::lookup_skel ( _tao_upcall, _tao_impl, search_name.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->lookup ( search_name.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7563,7 +7563,7 @@ void POA_CORBA_Container::lookup_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7571,12 +7571,12 @@ void POA_CORBA_Container::lookup_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7604,7 +7604,7 @@ void POA_CORBA_Container::contents_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7636,12 +7636,12 @@ void POA_CORBA_Container::contents_skel ( _tao_impl, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7649,7 +7649,7 @@ void POA_CORBA_Container::contents_skel ( _tao_impl->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7658,7 +7658,7 @@ void POA_CORBA_Container::contents_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7666,12 +7666,12 @@ void POA_CORBA_Container::contents_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7699,7 +7699,7 @@ void POA_CORBA_Container::lookup_name_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7737,12 +7737,12 @@ void POA_CORBA_Container::lookup_name_skel ( levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7752,7 +7752,7 @@ void POA_CORBA_Container::lookup_name_skel ( levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7761,7 +7761,7 @@ void POA_CORBA_Container::lookup_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7769,12 +7769,12 @@ void POA_CORBA_Container::lookup_name_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7802,7 +7802,7 @@ void POA_CORBA_Container::describe_contents_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7837,12 +7837,12 @@ void POA_CORBA_Container::describe_contents_skel ( limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7851,7 +7851,7 @@ void POA_CORBA_Container::describe_contents_skel ( limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7860,7 +7860,7 @@ void POA_CORBA_Container::describe_contents_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7868,12 +7868,12 @@ void POA_CORBA_Container::describe_contents_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7901,7 +7901,7 @@ void POA_CORBA_Container::create_module_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7936,12 +7936,12 @@ void POA_CORBA_Container::create_module_skel ( id.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7950,7 +7950,7 @@ void POA_CORBA_Container::create_module_skel ( id.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7959,7 +7959,7 @@ void POA_CORBA_Container::create_module_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7967,12 +7967,12 @@ void POA_CORBA_Container::create_module_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8000,7 +8000,7 @@ void POA_CORBA_Container::create_constant_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8041,12 +8041,12 @@ void POA_CORBA_Container::create_constant_skel ( version.in (), type.in (), value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8057,7 +8057,7 @@ void POA_CORBA_Container::create_constant_skel ( version.in (), type.in (), value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8066,7 +8066,7 @@ void POA_CORBA_Container::create_constant_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8074,12 +8074,12 @@ void POA_CORBA_Container::create_constant_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8107,7 +8107,7 @@ void POA_CORBA_Container::create_struct_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8145,12 +8145,12 @@ void POA_CORBA_Container::create_struct_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8160,7 +8160,7 @@ void POA_CORBA_Container::create_struct_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8169,7 +8169,7 @@ void POA_CORBA_Container::create_struct_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8177,12 +8177,12 @@ void POA_CORBA_Container::create_struct_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8210,7 +8210,7 @@ void POA_CORBA_Container::create_union_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8251,12 +8251,12 @@ void POA_CORBA_Container::create_union_skel ( version.in (), discriminator_type.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8267,7 +8267,7 @@ void POA_CORBA_Container::create_union_skel ( version.in (), discriminator_type.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8276,7 +8276,7 @@ void POA_CORBA_Container::create_union_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8284,12 +8284,12 @@ void POA_CORBA_Container::create_union_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8317,7 +8317,7 @@ void POA_CORBA_Container::create_enum_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8355,12 +8355,12 @@ void POA_CORBA_Container::create_enum_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8370,7 +8370,7 @@ void POA_CORBA_Container::create_enum_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8379,7 +8379,7 @@ void POA_CORBA_Container::create_enum_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8387,12 +8387,12 @@ void POA_CORBA_Container::create_enum_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8420,7 +8420,7 @@ void POA_CORBA_Container::create_alias_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8458,12 +8458,12 @@ void POA_CORBA_Container::create_alias_skel ( name.in (), version.in (), original_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8473,7 +8473,7 @@ void POA_CORBA_Container::create_alias_skel ( name.in (), version.in (), original_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8482,7 +8482,7 @@ void POA_CORBA_Container::create_alias_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8490,12 +8490,12 @@ void POA_CORBA_Container::create_alias_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8523,7 +8523,7 @@ void POA_CORBA_Container::create_interface_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8561,12 +8561,12 @@ void POA_CORBA_Container::create_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8576,7 +8576,7 @@ void POA_CORBA_Container::create_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8585,7 +8585,7 @@ void POA_CORBA_Container::create_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8593,12 +8593,12 @@ void POA_CORBA_Container::create_interface_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8626,7 +8626,7 @@ void POA_CORBA_Container::create_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8682,12 +8682,12 @@ void POA_CORBA_Container::create_value_skel ( abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8703,7 +8703,7 @@ void POA_CORBA_Container::create_value_skel ( abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8712,7 +8712,7 @@ void POA_CORBA_Container::create_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8720,12 +8720,12 @@ void POA_CORBA_Container::create_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8753,7 +8753,7 @@ void POA_CORBA_Container::create_value_box_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8791,12 +8791,12 @@ void POA_CORBA_Container::create_value_box_skel ( name.in (), version.in (), original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8806,7 +8806,7 @@ void POA_CORBA_Container::create_value_box_skel ( name.in (), version.in (), original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8815,7 +8815,7 @@ void POA_CORBA_Container::create_value_box_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8823,12 +8823,12 @@ void POA_CORBA_Container::create_value_box_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8856,7 +8856,7 @@ void POA_CORBA_Container::create_exception_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8894,12 +8894,12 @@ void POA_CORBA_Container::create_exception_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8909,7 +8909,7 @@ void POA_CORBA_Container::create_exception_skel ( name.in (), version.in (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8918,7 +8918,7 @@ void POA_CORBA_Container::create_exception_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8926,12 +8926,12 @@ void POA_CORBA_Container::create_exception_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8959,7 +8959,7 @@ void POA_CORBA_Container::create_native_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8994,12 +8994,12 @@ void POA_CORBA_Container::create_native_skel ( id.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -9008,7 +9008,7 @@ void POA_CORBA_Container::create_native_skel ( id.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9017,7 +9017,7 @@ void POA_CORBA_Container::create_native_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9025,12 +9025,12 @@ void POA_CORBA_Container::create_native_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9058,7 +9058,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9096,12 +9096,12 @@ void POA_CORBA_Container::create_abstract_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -9111,7 +9111,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9120,7 +9120,7 @@ void POA_CORBA_Container::create_abstract_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9128,12 +9128,12 @@ void POA_CORBA_Container::create_abstract_interface_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9161,7 +9161,7 @@ void POA_CORBA_Container::create_local_interface_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9199,12 +9199,12 @@ void POA_CORBA_Container::create_local_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -9214,7 +9214,7 @@ void POA_CORBA_Container::create_local_interface_skel ( name.in (), version.in (), base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9223,7 +9223,7 @@ void POA_CORBA_Container::create_local_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9231,12 +9231,12 @@ void POA_CORBA_Container::create_local_interface_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9264,7 +9264,7 @@ void POA_CORBA_Container::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9274,7 +9274,7 @@ void POA_CORBA_Container::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9287,11 +9287,11 @@ void POA_CORBA_Container::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9304,7 +9304,7 @@ void POA_CORBA_Container::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference; @@ -9323,7 +9323,7 @@ void POA_CORBA_Container::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9350,10 +9350,10 @@ void POA_CORBA_Container::_interface_skel ( CORBA::Boolean POA_CORBA_Container::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9378,12 +9378,12 @@ void* POA_CORBA_Container::_downcast ( return 0; } -void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9393,9 +9393,9 @@ const char* POA_CORBA_Container::_interface_repository_id (void) const } CORBA_Container* -POA_CORBA_Container::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Container::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -9531,31 +9531,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IDLType *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -9573,44 +9573,44 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLTyp TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_IDLType *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9622,7 +9622,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9632,10 +9632,10 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -9675,17 +9675,17 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::~_TAO_CORBA_IDLType_Strategized_Pro _TAO_CORBA_IDLType_Proxy_Impl& _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy ( ::CORBA_IDLType *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -9695,7 +9695,7 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -9765,7 +9765,7 @@ _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (vo CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9781,7 +9781,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -9790,7 +9790,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/IDLType:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -9819,7 +9819,7 @@ void POA_CORBA_IDLType::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType *_tao_impl = @@ -9840,18 +9840,18 @@ void POA_CORBA_IDLType::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9860,7 +9860,7 @@ void POA_CORBA_IDLType::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9868,12 +9868,12 @@ void POA_CORBA_IDLType::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9901,7 +9901,7 @@ void POA_CORBA_IDLType::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9911,7 +9911,7 @@ void POA_CORBA_IDLType::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9924,11 +9924,11 @@ void POA_CORBA_IDLType::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9941,7 +9941,7 @@ void POA_CORBA_IDLType::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference; @@ -9960,7 +9960,7 @@ void POA_CORBA_IDLType::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9987,10 +9987,10 @@ void POA_CORBA_IDLType::_interface_skel ( CORBA::Boolean POA_CORBA_IDLType::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10015,12 +10015,12 @@ void* POA_CORBA_IDLType::_downcast ( return 0; } -void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10030,9 +10030,9 @@ const char* POA_CORBA_IDLType::_interface_repository_id (void) const } CORBA_IDLType* -POA_CORBA_IDLType::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_IDLType::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -10221,17 +10221,17 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::~_TAO_CORBA_TypedefDef_Strategiz _TAO_CORBA_TypedefDef_Proxy_Impl& _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_TypedefDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -10241,7 +10241,7 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -10336,7 +10336,7 @@ void POA_CORBA_TypedefDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10346,7 +10346,7 @@ void POA_CORBA_TypedefDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10359,11 +10359,11 @@ void POA_CORBA_TypedefDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10376,7 +10376,7 @@ void POA_CORBA_TypedefDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference; @@ -10395,7 +10395,7 @@ void POA_CORBA_TypedefDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -10422,10 +10422,10 @@ void POA_CORBA_TypedefDef::_interface_skel ( CORBA::Boolean POA_CORBA_TypedefDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10456,12 +10456,12 @@ void* POA_CORBA_TypedefDef::_downcast ( return 0; } -void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10471,9 +10471,9 @@ const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const } CORBA_TypedefDef* -POA_CORBA_TypedefDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h index 245cba71f61..e1077f9c8d8 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h @@ -64,7 +64,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -75,37 +75,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_IRObject *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -115,11 +115,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -129,7 +129,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -149,7 +149,7 @@ public: virtual ::_TAO_CORBA_IRObject_Proxy_Impl &select_proxy ( ::CORBA_IRObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -158,7 +158,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -199,7 +199,7 @@ public: virtual CORBA::DefinitionKind def_kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -207,7 +207,7 @@ public: virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -239,7 +239,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -250,37 +250,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_Contained *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -290,12 +290,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -305,11 +305,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -319,12 +319,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -334,11 +334,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -348,12 +348,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -363,11 +363,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -377,11 +377,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -391,11 +391,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -405,11 +405,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -419,14 +419,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -436,21 +436,21 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -470,7 +470,7 @@ public: virtual ::_TAO_CORBA_Contained_Proxy_Impl &select_proxy ( ::CORBA_Contained *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -479,7 +479,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -522,7 +522,7 @@ public: virtual char * id ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -531,7 +531,7 @@ public: virtual void id ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -539,7 +539,7 @@ public: virtual char * name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -548,7 +548,7 @@ public: virtual void name ( CORBA_Object *_collocated_tao_target_, const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -556,7 +556,7 @@ public: virtual char * version ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -565,7 +565,7 @@ public: virtual void version ( CORBA_Object *_collocated_tao_target_, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -573,7 +573,7 @@ public: virtual CORBA_Container_ptr defined_in ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -581,7 +581,7 @@ public: virtual char * absolute_name ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -589,7 +589,7 @@ public: virtual CORBA_Repository_ptr containing_repository ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -597,7 +597,7 @@ public: virtual CORBA_Contained::Description * describe ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -608,7 +608,7 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -640,7 +640,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -651,38 +651,38 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_Container *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -692,13 +692,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -708,7 +708,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ContainedSeq * lookup_name ( @@ -716,7 +716,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -726,14 +726,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_Container::DescriptionSeq * describe_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -743,14 +743,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ModuleDef_ptr create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -760,7 +760,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ConstantDef_ptr create_constant ( @@ -769,7 +769,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -779,7 +779,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_StructDef_ptr create_struct ( @@ -787,7 +787,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -797,7 +797,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_UnionDef_ptr create_union ( @@ -806,7 +806,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -816,7 +816,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_EnumDef_ptr create_enum ( @@ -824,7 +824,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -834,7 +834,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_AliasDef_ptr create_alias ( @@ -842,7 +842,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -852,7 +852,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_InterfaceDef_ptr create_interface ( @@ -860,7 +860,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -870,7 +870,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef_ptr create_value ( @@ -884,7 +884,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -894,7 +894,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueBoxDef_ptr create_value_box ( @@ -902,7 +902,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -912,7 +912,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ExceptionDef_ptr create_exception ( @@ -920,7 +920,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -930,14 +930,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_NativeDef_ptr create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -947,7 +947,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface ( @@ -955,7 +955,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -965,7 +965,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_LocalInterfaceDef_ptr create_local_interface ( @@ -973,7 +973,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -983,21 +983,21 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1017,7 +1017,7 @@ public: virtual ::_TAO_CORBA_Container_Proxy_Impl &select_proxy ( ::CORBA_Container *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1026,7 +1026,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1070,7 +1070,7 @@ public: virtual CORBA_Contained_ptr lookup ( CORBA_Object *_collocated_tao_target_, const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1080,7 +1080,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1092,7 +1092,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1103,7 +1103,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1114,7 +1114,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1127,7 +1127,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1139,7 +1139,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1152,7 +1152,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1164,7 +1164,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1176,7 +1176,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1188,7 +1188,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1206,7 +1206,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1218,7 +1218,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1230,7 +1230,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1241,7 +1241,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1253,7 +1253,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1265,7 +1265,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1297,7 +1297,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1308,37 +1308,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_IDLType *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1348,21 +1348,21 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1382,7 +1382,7 @@ public: virtual ::_TAO_CORBA_IDLType_Proxy_Impl &select_proxy ( ::CORBA_IDLType *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1391,7 +1391,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1434,7 +1434,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1466,7 +1466,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1477,31 +1477,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_TypedefDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -1510,98 +1510,98 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1621,7 +1621,7 @@ public: virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy ( ::CORBA_TypedefDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1630,7 +1630,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i index 477a44b0871..8224fd18394 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Contained::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_Contained::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj; @@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Container::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj; @@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_Container::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj; @@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_IDLType::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj; @@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_IDLType::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj; @@ -316,6 +316,6 @@ ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h index 87fb981b893..0d9c58482b6 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h @@ -67,17 +67,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -123,10 +123,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -134,14 +134,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -149,14 +149,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -164,35 +164,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -202,21 +202,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -262,11 +262,11 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -275,7 +275,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -286,7 +286,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -296,7 +296,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -306,7 +306,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -318,7 +318,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -329,7 +329,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -341,7 +341,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -352,7 +352,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -363,7 +363,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -374,7 +374,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -391,7 +391,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -402,7 +402,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -413,7 +413,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -423,7 +423,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -434,7 +434,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -445,21 +445,21 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -505,24 +505,24 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -568,10 +568,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -579,14 +579,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -594,14 +594,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -609,35 +609,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -647,28 +647,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i index ee67530cc11..2dd1632a3b6 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i @@ -90,37 +90,37 @@ POA_CORBA_IRObject_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_IRObject_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_IRObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_IRObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_IRObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_IRObject_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_IRObject_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -193,31 +193,31 @@ POA_CORBA_Contained_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_Contained_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Contained_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_Contained::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_Contained::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE char * POA_CORBA_Contained_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_Contained_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -225,27 +225,27 @@ void POA_CORBA_Contained_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_Contained_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_Contained_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -253,27 +253,27 @@ void POA_CORBA_Contained_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_Contained_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_Contained_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -281,59 +281,59 @@ void POA_CORBA_Contained_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_Contained_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_Contained_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_Contained_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_Contained_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -342,7 +342,7 @@ void POA_CORBA_Contained_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -352,33 +352,33 @@ void POA_CORBA_Contained_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_Contained_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_Contained_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -451,18 +451,18 @@ POA_CORBA_Container_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_Container_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Container_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_Container::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_Container_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -470,7 +470,7 @@ CORBA_Contained_ptr POA_CORBA_Container_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -478,7 +478,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -487,7 +487,7 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -497,7 +497,7 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -508,7 +508,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -517,7 +517,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -527,7 +527,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -536,7 +536,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -546,7 +546,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -557,7 +557,7 @@ CORBA_ConstantDef_ptr POA_CORBA_Container_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -569,7 +569,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -579,7 +579,7 @@ CORBA_StructDef_ptr POA_CORBA_Container_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -590,7 +590,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -601,7 +601,7 @@ CORBA_UnionDef_ptr POA_CORBA_Container_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -613,7 +613,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -623,7 +623,7 @@ CORBA_EnumDef_ptr POA_CORBA_Container_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -634,7 +634,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -644,7 +644,7 @@ CORBA_AliasDef_ptr POA_CORBA_Container_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -655,7 +655,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -665,7 +665,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_Container_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -676,7 +676,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -692,7 +692,7 @@ CORBA_ValueDef_ptr POA_CORBA_Container_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -709,7 +709,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -719,7 +719,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Container_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -730,7 +730,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -740,7 +740,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_Container_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -751,7 +751,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -760,7 +760,7 @@ CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -770,7 +770,7 @@ CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -780,7 +780,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_abstract_inter const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -791,7 +791,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -801,7 +801,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -812,33 +812,33 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_Container_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_Container_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -911,50 +911,50 @@ POA_CORBA_IDLType_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_IDLType_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_IDLType_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_IDLType::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_IDLType::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_IDLType_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_IDLType_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_IDLType_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1027,31 +1027,31 @@ POA_CORBA_TypedefDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_TypedefDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_TypedefDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_TypedefDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_TypedefDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE char * POA_CORBA_TypedefDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_TypedefDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1059,27 +1059,27 @@ void POA_CORBA_TypedefDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_TypedefDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_TypedefDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1087,27 +1087,27 @@ void POA_CORBA_TypedefDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_TypedefDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_TypedefDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1115,59 +1115,59 @@ void POA_CORBA_TypedefDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_TypedefDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_TypedefDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_TypedefDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_TypedefDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1176,7 +1176,7 @@ void POA_CORBA_TypedefDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1186,46 +1186,46 @@ void POA_CORBA_TypedefDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_TypedefDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_TypedefDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_TypedefDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp index 40d924df88c..f50c0f1c3be 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp @@ -210,31 +210,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_Contained_ptr result); @@ -254,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, const char * search_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -262,12 +262,12 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -283,25 +283,25 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -313,7 +313,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -323,10 +323,10 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -344,31 +344,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -388,7 +388,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -396,12 +396,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -417,25 +417,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -447,7 +447,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -457,10 +457,10 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -478,31 +478,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , CORBA::PrimitiveKind & kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_PrimitiveDef_ptr result); @@ -522,7 +522,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, CORBA::PrimitiveKind & kind - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -530,12 +530,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -551,25 +551,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -581,7 +581,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -591,10 +591,10 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -612,31 +612,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_StringDef_ptr result); @@ -656,7 +656,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -664,12 +664,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -685,25 +685,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_string::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -715,7 +715,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -725,10 +725,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_string::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -746,31 +746,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_WstringDef_ptr result); @@ -790,7 +790,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Repository *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -798,12 +798,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -819,25 +819,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -849,7 +849,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -859,10 +859,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -881,31 +881,31 @@ public: , const CORBA::ULong & bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_SequenceDef_ptr result); @@ -927,7 +927,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO POA_CORBA_Repository *tao_impl, const CORBA::ULong & bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -936,12 +936,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -960,25 +960,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -990,7 +990,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1000,10 +1000,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1022,31 +1022,31 @@ public: , const CORBA::ULong & length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ArrayDef_ptr result); @@ -1068,7 +1068,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA POA_CORBA_Repository *tao_impl, const CORBA::ULong & length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1077,12 +1077,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1101,25 +1101,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_array::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1131,7 +1131,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1141,10 +1141,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_array::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1163,31 +1163,31 @@ public: , const CORBA::UShort & digits, const CORBA::Short & scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_FixedDef_ptr result); @@ -1209,7 +1209,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA POA_CORBA_Repository *tao_impl, const CORBA::UShort & digits, const CORBA::Short & scale - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1218,12 +1218,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1242,25 +1242,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1272,7 +1272,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1282,10 +1282,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1325,17 +1325,17 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::~_TAO_CORBA_Repository_Strategiz _TAO_CORBA_Repository_Proxy_Impl& _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy ( ::CORBA_Repository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -1345,7 +1345,7 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -1416,7 +1416,7 @@ _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::_TAO_CORBA_Repository_ThruPOA_Proxy_Im CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id ( CORBA_Object *_collocated_tao_target_, const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1432,7 +1432,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id ( _collocated_tao_target_->_object_key (), "lookup_id", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1442,14 +1442,14 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id ( ) )->lookup_id ( search_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode ( CORBA_Object *_collocated_tao_target_, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1465,7 +1465,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type _collocated_tao_target_->_object_key (), "get_canonical_typecode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1475,14 +1475,14 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type ) )->get_canonical_typecode ( tc - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive ( CORBA_Object *_collocated_tao_target_, CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1498,7 +1498,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive ( _collocated_tao_target_->_object_key (), "get_primitive", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1508,14 +1508,14 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive ( ) )->get_primitive ( kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1531,7 +1531,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string ( _collocated_tao_target_->_object_key (), "create_string", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1541,14 +1541,14 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string ( ) )->create_string ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1564,7 +1564,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring ( _collocated_tao_target_->_object_key (), "create_wstring", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1574,7 +1574,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring ( ) )->create_wstring ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1582,7 +1582,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence CORBA_Object *_collocated_tao_target_, CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1598,7 +1598,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence _collocated_tao_target_->_object_key (), "create_sequence", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1609,7 +1609,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence )->create_sequence ( bound, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1617,7 +1617,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1633,7 +1633,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array ( _collocated_tao_target_->_object_key (), "create_array", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1644,7 +1644,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array ( )->create_array ( length, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1652,7 +1652,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1668,7 +1668,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed ( _collocated_tao_target_->_object_key (), "create_fixed", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1679,7 +1679,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed ( )->create_fixed ( digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1709,7 +1709,7 @@ void POA_CORBA_Repository::lookup_id_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1738,19 +1738,19 @@ void POA_CORBA_Repository::lookup_id_skel ( _tao_upcall, _tao_impl, search_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->lookup_id ( search_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1759,7 +1759,7 @@ void POA_CORBA_Repository::lookup_id_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1767,12 +1767,12 @@ void POA_CORBA_Repository::lookup_id_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1800,7 +1800,7 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1829,19 +1829,19 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( _tao_upcall, _tao_impl, tc.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->get_canonical_typecode ( tc.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1850,7 +1850,7 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1858,12 +1858,12 @@ void POA_CORBA_Repository::get_canonical_typecode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1891,7 +1891,7 @@ void POA_CORBA_Repository::get_primitive_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1920,19 +1920,19 @@ void POA_CORBA_Repository::get_primitive_skel ( _tao_upcall, _tao_impl, kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->get_primitive ( kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1941,7 +1941,7 @@ void POA_CORBA_Repository::get_primitive_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1949,12 +1949,12 @@ void POA_CORBA_Repository::get_primitive_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1982,7 +1982,7 @@ void POA_CORBA_Repository::create_string_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2011,19 +2011,19 @@ void POA_CORBA_Repository::create_string_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->create_string ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2032,7 +2032,7 @@ void POA_CORBA_Repository::create_string_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2040,12 +2040,12 @@ void POA_CORBA_Repository::create_string_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2073,7 +2073,7 @@ void POA_CORBA_Repository::create_wstring_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2102,19 +2102,19 @@ void POA_CORBA_Repository::create_wstring_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->create_wstring ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2123,7 +2123,7 @@ void POA_CORBA_Repository::create_wstring_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2131,12 +2131,12 @@ void POA_CORBA_Repository::create_wstring_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2164,7 +2164,7 @@ void POA_CORBA_Repository::create_sequence_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2196,12 +2196,12 @@ void POA_CORBA_Repository::create_sequence_skel ( _tao_impl, bound, element_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -2209,7 +2209,7 @@ void POA_CORBA_Repository::create_sequence_skel ( _tao_impl->create_sequence ( bound, element_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2218,7 +2218,7 @@ void POA_CORBA_Repository::create_sequence_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2226,12 +2226,12 @@ void POA_CORBA_Repository::create_sequence_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2259,7 +2259,7 @@ void POA_CORBA_Repository::create_array_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2291,12 +2291,12 @@ void POA_CORBA_Repository::create_array_skel ( _tao_impl, length, element_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -2304,7 +2304,7 @@ void POA_CORBA_Repository::create_array_skel ( _tao_impl->create_array ( length, element_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2313,7 +2313,7 @@ void POA_CORBA_Repository::create_array_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2321,12 +2321,12 @@ void POA_CORBA_Repository::create_array_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2354,7 +2354,7 @@ void POA_CORBA_Repository::create_fixed_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2386,12 +2386,12 @@ void POA_CORBA_Repository::create_fixed_skel ( _tao_impl, digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -2399,7 +2399,7 @@ void POA_CORBA_Repository::create_fixed_skel ( _tao_impl->create_fixed ( digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2408,7 +2408,7 @@ void POA_CORBA_Repository::create_fixed_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2416,12 +2416,12 @@ void POA_CORBA_Repository::create_fixed_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2449,7 +2449,7 @@ void POA_CORBA_Repository::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2459,7 +2459,7 @@ void POA_CORBA_Repository::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2472,11 +2472,11 @@ void POA_CORBA_Repository::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2489,7 +2489,7 @@ void POA_CORBA_Repository::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference; @@ -2508,7 +2508,7 @@ void POA_CORBA_Repository::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -2535,10 +2535,10 @@ void POA_CORBA_Repository::_interface_skel ( CORBA::Boolean POA_CORBA_Repository::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -2566,12 +2566,12 @@ void* POA_CORBA_Repository::_downcast ( return 0; } -void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -2581,9 +2581,9 @@ const char* POA_CORBA_Repository::_interface_repository_id (void) const } CORBA_Repository* -POA_CORBA_Repository::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Repository::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -2791,17 +2791,17 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::~_TAO_CORBA_ModuleDef_Strategized _TAO_CORBA_ModuleDef_Proxy_Impl& _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ModuleDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2811,7 +2811,7 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2906,7 +2906,7 @@ void POA_CORBA_ModuleDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2916,7 +2916,7 @@ void POA_CORBA_ModuleDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2929,11 +2929,11 @@ void POA_CORBA_ModuleDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2946,7 +2946,7 @@ void POA_CORBA_ModuleDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference; @@ -2965,7 +2965,7 @@ void POA_CORBA_ModuleDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -2992,10 +2992,10 @@ void POA_CORBA_ModuleDef::_interface_skel ( CORBA::Boolean POA_CORBA_ModuleDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -3026,12 +3026,12 @@ void* POA_CORBA_ModuleDef::_downcast ( return 0; } -void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3041,9 +3041,9 @@ const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const } CORBA_ModuleDef* -POA_CORBA_ModuleDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -3214,31 +3214,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -3256,44 +3256,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_Co TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3305,7 +3305,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3315,10 +3315,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3335,31 +3335,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -3377,44 +3377,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORB TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3426,7 +3426,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3436,10 +3436,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3457,31 +3457,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3500,7 +3500,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3508,12 +3508,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3529,25 +3529,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3555,7 +3555,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3565,10 +3565,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerRequestInfo @@ -3578,31 +3578,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Any * result); @@ -3620,44 +3620,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3669,7 +3669,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3679,10 +3679,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3700,31 +3700,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl , const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3743,7 +3743,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstantDef *tao_impl, const CORBA::Any & value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3751,12 +3751,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3772,25 +3772,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3798,7 +3798,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3808,10 +3808,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -3844,17 +3844,17 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::~_TAO_CORBA_ConstantDef_Strateg _TAO_CORBA_ConstantDef_Proxy_Impl& _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ConstantDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -3864,7 +3864,7 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -3934,7 +3934,7 @@ _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ConstantDef_ThruPOA_Proxy_ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3950,7 +3950,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -3959,13 +3959,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3981,7 +3981,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -3990,14 +3990,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4011,7 +4011,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -4021,14 +4021,14 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( ) )->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4044,7 +4044,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( _collocated_tao_target_->_object_key (), "value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -4053,14 +4053,14 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( CORBA_Object *_collocated_tao_target_, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4074,7 +4074,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( _collocated_tao_target_->_object_key (), "value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -4084,7 +4084,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( ) )->value ( value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -4115,7 +4115,7 @@ void POA_CORBA_ConstantDef::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = @@ -4136,18 +4136,18 @@ void POA_CORBA_ConstantDef::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4156,7 +4156,7 @@ void POA_CORBA_ConstantDef::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4164,12 +4164,12 @@ void POA_CORBA_ConstantDef::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4197,7 +4197,7 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = @@ -4218,18 +4218,18 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4238,7 +4238,7 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4246,12 +4246,12 @@ void POA_CORBA_ConstantDef::_get_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4279,7 +4279,7 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4308,25 +4308,25 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( _tao_upcall, _tao_impl, type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->type_def ( type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4334,12 +4334,12 @@ void POA_CORBA_ConstantDef::_set_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4360,7 +4360,7 @@ void POA_CORBA_ConstantDef::_get_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = @@ -4381,18 +4381,18 @@ void POA_CORBA_ConstantDef::_get_value_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4401,7 +4401,7 @@ void POA_CORBA_ConstantDef::_get_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4409,12 +4409,12 @@ void POA_CORBA_ConstantDef::_get_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4442,7 +4442,7 @@ void POA_CORBA_ConstantDef::_set_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4471,25 +4471,25 @@ void POA_CORBA_ConstantDef::_set_value_skel ( _tao_upcall, _tao_impl, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->value ( value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4497,12 +4497,12 @@ void POA_CORBA_ConstantDef::_set_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -4523,7 +4523,7 @@ void POA_CORBA_ConstantDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4533,7 +4533,7 @@ void POA_CORBA_ConstantDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4546,11 +4546,11 @@ void POA_CORBA_ConstantDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4563,7 +4563,7 @@ void POA_CORBA_ConstantDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference; @@ -4582,7 +4582,7 @@ void POA_CORBA_ConstantDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4609,10 +4609,10 @@ void POA_CORBA_ConstantDef::_interface_skel ( CORBA::Boolean POA_CORBA_ConstantDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4640,12 +4640,12 @@ void* POA_CORBA_ConstantDef::_downcast ( return 0; } -void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4655,9 +4655,9 @@ const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const } CORBA_ConstantDef* -POA_CORBA_ConstantDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -4845,31 +4845,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_StructMemberSeq * result); @@ -4887,44 +4887,44 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_S TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_StructDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4936,7 +4936,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4946,10 +4946,10 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4967,31 +4967,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl , const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5010,7 +5010,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_StructDef *tao_impl, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5018,12 +5018,12 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5039,25 +5039,25 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -5065,7 +5065,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5075,10 +5075,10 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -5111,17 +5111,17 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::~_TAO_CORBA_StructDef_Strategized _TAO_CORBA_StructDef_Proxy_Impl& _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_StructDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -5131,7 +5131,7 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -5201,7 +5201,7 @@ _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5217,7 +5217,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -5226,14 +5226,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( "IDL:omg.org/CORBA/StructDef:1.0" ) )->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5247,7 +5247,7 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -5257,7 +5257,7 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( ) )->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -5291,7 +5291,7 @@ void POA_CORBA_StructDef::_get_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StructDef *_tao_impl = @@ -5312,18 +5312,18 @@ void POA_CORBA_StructDef::_get_members_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -5332,7 +5332,7 @@ void POA_CORBA_StructDef::_get_members_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -5340,12 +5340,12 @@ void POA_CORBA_StructDef::_get_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -5373,7 +5373,7 @@ void POA_CORBA_StructDef::_set_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -5402,25 +5402,25 @@ void POA_CORBA_StructDef::_set_members_skel ( _tao_upcall, _tao_impl, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -5428,12 +5428,12 @@ void POA_CORBA_StructDef::_set_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -5454,7 +5454,7 @@ void POA_CORBA_StructDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -5464,7 +5464,7 @@ void POA_CORBA_StructDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -5477,11 +5477,11 @@ void POA_CORBA_StructDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -5494,7 +5494,7 @@ void POA_CORBA_StructDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference; @@ -5513,7 +5513,7 @@ void POA_CORBA_StructDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -5540,10 +5540,10 @@ void POA_CORBA_StructDef::_interface_skel ( CORBA::Boolean POA_CORBA_StructDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -5580,12 +5580,12 @@ void* POA_CORBA_StructDef::_downcast ( return 0; } -void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -5595,9 +5595,9 @@ const char* POA_CORBA_StructDef::_interface_repository_id (void) const } CORBA_StructDef* -POA_CORBA_StructDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_StructDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -5788,31 +5788,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -5830,44 +5830,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestIn TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5879,7 +5879,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SIN char * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5889,10 +5889,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5909,31 +5909,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -5951,44 +5951,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerReque TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6000,7 +6000,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV char * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6010,10 +6010,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6031,31 +6031,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6074,7 +6074,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6082,12 +6082,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6103,25 +6103,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -6129,7 +6129,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV char * TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6139,10 +6139,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerRequestInfo @@ -6152,31 +6152,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_UnionMemberSeq * result); @@ -6194,44 +6194,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_Un TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6243,7 +6243,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6253,10 +6253,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6274,31 +6274,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl , const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -6317,7 +6317,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_UnionDef *tao_impl, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6325,12 +6325,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6346,25 +6346,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -6372,7 +6372,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6382,10 +6382,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -6418,17 +6418,17 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::~_TAO_CORBA_UnionDef_Strategized_P _TAO_CORBA_UnionDef_Proxy_Impl& _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_UnionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -6438,7 +6438,7 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -6508,7 +6508,7 @@ _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl ( CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6524,7 +6524,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type ( _collocated_tao_target_->_object_key (), "discriminator_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6533,13 +6533,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type ( "IDL:omg.org/CORBA/UnionDef:1.0" ) )->discriminator_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6555,7 +6555,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def _collocated_tao_target_->_object_key (), "discriminator_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6564,14 +6564,14 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def "IDL:omg.org/CORBA/UnionDef:1.0" ) )->discriminator_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6585,7 +6585,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( _collocated_tao_target_->_object_key (), "discriminator_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6595,14 +6595,14 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( ) )->discriminator_type_def ( discriminator_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6618,7 +6618,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6627,14 +6627,14 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( "IDL:omg.org/CORBA/UnionDef:1.0" ) )->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6648,7 +6648,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6658,7 +6658,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( ) )->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -6692,7 +6692,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = @@ -6713,18 +6713,18 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->discriminator_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6733,7 +6733,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6741,12 +6741,12 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6774,7 +6774,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = @@ -6795,18 +6795,18 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->discriminator_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6815,7 +6815,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6823,12 +6823,12 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6856,7 +6856,7 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -6885,25 +6885,25 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( _tao_upcall, _tao_impl, discriminator_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->discriminator_type_def ( discriminator_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6911,12 +6911,12 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6937,7 +6937,7 @@ void POA_CORBA_UnionDef::_get_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = @@ -6958,18 +6958,18 @@ void POA_CORBA_UnionDef::_get_members_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6978,7 +6978,7 @@ void POA_CORBA_UnionDef::_get_members_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6986,12 +6986,12 @@ void POA_CORBA_UnionDef::_get_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7019,7 +7019,7 @@ void POA_CORBA_UnionDef::_set_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7048,25 +7048,25 @@ void POA_CORBA_UnionDef::_set_members_skel ( _tao_upcall, _tao_impl, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7074,12 +7074,12 @@ void POA_CORBA_UnionDef::_set_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7100,7 +7100,7 @@ void POA_CORBA_UnionDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7110,7 +7110,7 @@ void POA_CORBA_UnionDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -7123,11 +7123,11 @@ void POA_CORBA_UnionDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -7140,7 +7140,7 @@ void POA_CORBA_UnionDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference; @@ -7159,7 +7159,7 @@ void POA_CORBA_UnionDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -7186,10 +7186,10 @@ void POA_CORBA_UnionDef::_interface_skel ( CORBA::Boolean POA_CORBA_UnionDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -7226,12 +7226,12 @@ void* POA_CORBA_UnionDef::_downcast ( return 0; } -void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -7241,9 +7241,9 @@ const char* POA_CORBA_UnionDef::_interface_repository_id (void) const } CORBA_UnionDef* -POA_CORBA_UnionDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -7412,31 +7412,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_EnumMemberSeq * result); @@ -7454,44 +7454,44 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_Enu TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_EnumDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7503,7 +7503,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -7513,10 +7513,10 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -7534,31 +7534,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl , const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -7577,7 +7577,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_EnumDef *tao_impl, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -7585,12 +7585,12 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -7606,25 +7606,25 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -7632,7 +7632,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -7642,10 +7642,10 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -7678,17 +7678,17 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::~_TAO_CORBA_EnumDef_Strategized_Pro _TAO_CORBA_EnumDef_Proxy_Impl& _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_EnumDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -7698,7 +7698,7 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -7768,7 +7768,7 @@ _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (vo CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7784,7 +7784,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7793,14 +7793,14 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( "IDL:omg.org/CORBA/EnumDef:1.0" ) )->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7814,7 +7814,7 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -7824,7 +7824,7 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( ) )->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -7857,7 +7857,7 @@ void POA_CORBA_EnumDef::_get_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_EnumDef *_tao_impl = @@ -7878,18 +7878,18 @@ void POA_CORBA_EnumDef::_get_members_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7898,7 +7898,7 @@ void POA_CORBA_EnumDef::_get_members_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7906,12 +7906,12 @@ void POA_CORBA_EnumDef::_get_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7939,7 +7939,7 @@ void POA_CORBA_EnumDef::_set_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7968,25 +7968,25 @@ void POA_CORBA_EnumDef::_set_members_skel ( _tao_upcall, _tao_impl, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7994,12 +7994,12 @@ void POA_CORBA_EnumDef::_set_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8020,7 +8020,7 @@ void POA_CORBA_EnumDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8030,7 +8030,7 @@ void POA_CORBA_EnumDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8043,11 +8043,11 @@ void POA_CORBA_EnumDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8060,7 +8060,7 @@ void POA_CORBA_EnumDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference; @@ -8079,7 +8079,7 @@ void POA_CORBA_EnumDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -8106,10 +8106,10 @@ void POA_CORBA_EnumDef::_interface_skel ( CORBA::Boolean POA_CORBA_EnumDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -8143,12 +8143,12 @@ void* POA_CORBA_EnumDef::_downcast ( return 0; } -void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -8158,9 +8158,9 @@ const char* POA_CORBA_EnumDef::_interface_repository_id (void) const } CORBA_EnumDef* -POA_CORBA_EnumDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -8329,31 +8329,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -8371,44 +8371,44 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInf TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AliasDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -8420,7 +8420,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SING char * TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -8430,10 +8430,10 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_ CORBA::Boolean TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -8451,31 +8451,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl , CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -8494,7 +8494,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AliasDef *tao_impl, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -8502,12 +8502,12 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -8523,25 +8523,25 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_S } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -8549,7 +8549,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SING char * TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -8559,10 +8559,10 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_ CORBA::Boolean TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -8595,17 +8595,17 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::~_TAO_CORBA_AliasDef_Strategized_P _TAO_CORBA_AliasDef_Proxy_Impl& _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_AliasDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -8615,7 +8615,7 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -8685,7 +8685,7 @@ _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl ( CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8701,7 +8701,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( _collocated_tao_target_->_object_key (), "original_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -8710,14 +8710,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( "IDL:omg.org/CORBA/AliasDef:1.0" ) )->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8731,7 +8731,7 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( _collocated_tao_target_->_object_key (), "original_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -8741,7 +8741,7 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( ) )->original_type_def ( original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -8774,7 +8774,7 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AliasDef *_tao_impl = @@ -8795,18 +8795,18 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8815,7 +8815,7 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8823,12 +8823,12 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8856,7 +8856,7 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8885,25 +8885,25 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( _tao_upcall, _tao_impl, original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->original_type_def ( original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8911,12 +8911,12 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8937,7 +8937,7 @@ void POA_CORBA_AliasDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8947,7 +8947,7 @@ void POA_CORBA_AliasDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8960,11 +8960,11 @@ void POA_CORBA_AliasDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8977,7 +8977,7 @@ void POA_CORBA_AliasDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference; @@ -8996,7 +8996,7 @@ void POA_CORBA_AliasDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9023,10 +9023,10 @@ void POA_CORBA_AliasDef::_interface_skel ( CORBA::Boolean POA_CORBA_AliasDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9060,12 +9060,12 @@ void* POA_CORBA_AliasDef::_downcast ( return 0; } -void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9075,9 +9075,9 @@ const char* POA_CORBA_AliasDef::_interface_repository_id (void) const } CORBA_AliasDef* -POA_CORBA_AliasDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -9267,17 +9267,17 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::~_TAO_CORBA_NativeDef_Strategized _TAO_CORBA_NativeDef_Proxy_Impl& _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_NativeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -9287,7 +9287,7 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -9383,7 +9383,7 @@ void POA_CORBA_NativeDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9393,7 +9393,7 @@ void POA_CORBA_NativeDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9406,11 +9406,11 @@ void POA_CORBA_NativeDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9423,7 +9423,7 @@ void POA_CORBA_NativeDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference; @@ -9442,7 +9442,7 @@ void POA_CORBA_NativeDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9469,10 +9469,10 @@ void POA_CORBA_NativeDef::_interface_skel ( CORBA::Boolean POA_CORBA_NativeDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9506,12 +9506,12 @@ void* POA_CORBA_NativeDef::_downcast ( return 0; } -void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9521,9 +9521,9 @@ const char* POA_CORBA_NativeDef::_interface_repository_id (void) const } CORBA_NativeDef* -POA_CORBA_NativeDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -9660,31 +9660,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_PrimitiveDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::PrimitiveKind result); @@ -9702,44 +9702,44 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_P TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_PrimitiveDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9751,7 +9751,7 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9761,10 +9761,10 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -9804,17 +9804,17 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Strat _TAO_CORBA_PrimitiveDef_Proxy_Impl& _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_PrimitiveDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -9824,7 +9824,7 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -9894,7 +9894,7 @@ _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_CORBA_PrimitiveDef_ThruPOA_Prox CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9910,7 +9910,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind ( _collocated_tao_target_->_object_key (), "kind", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -9919,7 +9919,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind ( "IDL:omg.org/CORBA/PrimitiveDef:1.0" ) )->kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -9949,7 +9949,7 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_PrimitiveDef *_tao_impl = @@ -9970,18 +9970,18 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9989,7 +9989,7 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( CORBA::PrimitiveKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9997,12 +9997,12 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10030,7 +10030,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10040,7 +10040,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10053,11 +10053,11 @@ void POA_CORBA_PrimitiveDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10070,7 +10070,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference; @@ -10089,7 +10089,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -10116,10 +10116,10 @@ void POA_CORBA_PrimitiveDef::_interface_skel ( CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10147,12 +10147,12 @@ void* POA_CORBA_PrimitiveDef::_downcast ( return 0; } -void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10162,9 +10162,9 @@ const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const } CORBA_PrimitiveDef* -POA_CORBA_PrimitiveDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -10321,31 +10321,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::ULong result); @@ -10363,44 +10363,44 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_Str TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_StringDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -10412,7 +10412,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -10422,10 +10422,10 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -10443,31 +10443,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -10486,7 +10486,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_StringDef *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -10494,12 +10494,12 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -10515,25 +10515,25 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -10541,7 +10541,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -10551,10 +10551,10 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -10587,17 +10587,17 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::~_TAO_CORBA_StringDef_Strategized _TAO_CORBA_StringDef_Proxy_Impl& _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_StringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -10607,7 +10607,7 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -10677,7 +10677,7 @@ _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10693,7 +10693,7 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -10702,14 +10702,14 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( "IDL:omg.org/CORBA/StringDef:1.0" ) )->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -10723,7 +10723,7 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -10733,7 +10733,7 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( ) )->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -10764,7 +10764,7 @@ void POA_CORBA_StringDef::_get_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StringDef *_tao_impl = @@ -10785,18 +10785,18 @@ void POA_CORBA_StringDef::_get_bound_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -10804,7 +10804,7 @@ void POA_CORBA_StringDef::_get_bound_skel ( CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -10812,12 +10812,12 @@ void POA_CORBA_StringDef::_get_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10845,7 +10845,7 @@ void POA_CORBA_StringDef::_set_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10874,25 +10874,25 @@ void POA_CORBA_StringDef::_set_bound_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -10900,12 +10900,12 @@ void POA_CORBA_StringDef::_set_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -10926,7 +10926,7 @@ void POA_CORBA_StringDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10936,7 +10936,7 @@ void POA_CORBA_StringDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10949,11 +10949,11 @@ void POA_CORBA_StringDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10966,7 +10966,7 @@ void POA_CORBA_StringDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference; @@ -10985,7 +10985,7 @@ void POA_CORBA_StringDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -11012,10 +11012,10 @@ void POA_CORBA_StringDef::_interface_skel ( CORBA::Boolean POA_CORBA_StringDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -11043,12 +11043,12 @@ void* POA_CORBA_StringDef::_downcast ( return 0; } -void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -11058,9 +11058,9 @@ const char* POA_CORBA_StringDef::_interface_repository_id (void) const } CORBA_StringDef* -POA_CORBA_StringDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_StringDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -11217,31 +11217,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::ULong result); @@ -11259,44 +11259,44 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_Ws TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_WstringDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11308,7 +11308,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11318,10 +11318,10 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11339,31 +11339,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -11382,7 +11382,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_WstringDef *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -11390,12 +11390,12 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -11411,25 +11411,25 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -11437,7 +11437,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11447,10 +11447,10 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -11483,17 +11483,17 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::~_TAO_CORBA_WstringDef_Strategiz _TAO_CORBA_WstringDef_Proxy_Impl& _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_WstringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -11503,7 +11503,7 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -11573,7 +11573,7 @@ _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_WstringDef_ThruPOA_Proxy_Im CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11589,7 +11589,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -11598,14 +11598,14 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( "IDL:omg.org/CORBA/WstringDef:1.0" ) )->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11619,7 +11619,7 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -11629,7 +11629,7 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( ) )->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -11660,7 +11660,7 @@ void POA_CORBA_WstringDef::_get_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_WstringDef *_tao_impl = @@ -11681,18 +11681,18 @@ void POA_CORBA_WstringDef::_get_bound_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -11700,7 +11700,7 @@ void POA_CORBA_WstringDef::_get_bound_skel ( CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -11708,12 +11708,12 @@ void POA_CORBA_WstringDef::_get_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11741,7 +11741,7 @@ void POA_CORBA_WstringDef::_set_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -11770,25 +11770,25 @@ void POA_CORBA_WstringDef::_set_bound_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -11796,12 +11796,12 @@ void POA_CORBA_WstringDef::_set_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -11822,7 +11822,7 @@ void POA_CORBA_WstringDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -11832,7 +11832,7 @@ void POA_CORBA_WstringDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -11845,11 +11845,11 @@ void POA_CORBA_WstringDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -11862,7 +11862,7 @@ void POA_CORBA_WstringDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference; @@ -11881,7 +11881,7 @@ void POA_CORBA_WstringDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -11908,10 +11908,10 @@ void POA_CORBA_WstringDef::_interface_skel ( CORBA::Boolean POA_CORBA_WstringDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -11939,12 +11939,12 @@ void* POA_CORBA_WstringDef::_downcast ( return 0; } -void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -11954,9 +11954,9 @@ const char* POA_CORBA_WstringDef::_interface_repository_id (void) const } CORBA_WstringDef* -POA_CORBA_WstringDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -12116,31 +12116,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::ULong result); @@ -12158,44 +12158,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_S TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12207,7 +12207,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12217,10 +12217,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12238,31 +12238,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , const CORBA::ULong & bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -12281,7 +12281,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl, const CORBA::ULong & bound - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -12289,12 +12289,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12310,25 +12310,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -12336,7 +12336,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12346,10 +12346,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_ServerRequestInfo @@ -12359,31 +12359,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -12401,44 +12401,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12450,7 +12450,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE char * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12460,10 +12460,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_in CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12480,31 +12480,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -12522,44 +12522,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestI TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12571,7 +12571,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12581,10 +12581,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12602,31 +12602,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl , CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -12645,7 +12645,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_SequenceDef *tao_impl, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -12653,12 +12653,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12674,25 +12674,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -12700,7 +12700,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12710,10 +12710,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -12746,17 +12746,17 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::~_TAO_CORBA_SequenceDef_Strateg _TAO_CORBA_SequenceDef_Proxy_Impl& _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_SequenceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -12766,7 +12766,7 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -12836,7 +12836,7 @@ _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_SequenceDef_ThruPOA_Proxy_ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12852,7 +12852,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -12861,14 +12861,14 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12882,7 +12882,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( _collocated_tao_target_->_object_key (), "bound", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -12892,14 +12892,14 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( ) )->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12915,7 +12915,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type ( _collocated_tao_target_->_object_key (), "element_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12924,13 +12924,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type ( "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12946,7 +12946,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( _collocated_tao_target_->_object_key (), "element_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12955,14 +12955,14 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12976,7 +12976,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( _collocated_tao_target_->_object_key (), "element_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -12986,7 +12986,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( ) )->element_type_def ( element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -13017,7 +13017,7 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = @@ -13038,18 +13038,18 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13057,7 +13057,7 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13065,12 +13065,12 @@ void POA_CORBA_SequenceDef::_get_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13098,7 +13098,7 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13127,25 +13127,25 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( _tao_upcall, _tao_impl, bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13153,12 +13153,12 @@ void POA_CORBA_SequenceDef::_set_bound_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13179,7 +13179,7 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = @@ -13200,18 +13200,18 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13220,7 +13220,7 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13228,12 +13228,12 @@ void POA_CORBA_SequenceDef::_get_element_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13261,7 +13261,7 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = @@ -13282,18 +13282,18 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13302,7 +13302,7 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13310,12 +13310,12 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13343,7 +13343,7 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13372,25 +13372,25 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( _tao_upcall, _tao_impl, element_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->element_type_def ( element_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13398,12 +13398,12 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13424,7 +13424,7 @@ void POA_CORBA_SequenceDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13434,7 +13434,7 @@ void POA_CORBA_SequenceDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -13447,11 +13447,11 @@ void POA_CORBA_SequenceDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -13464,7 +13464,7 @@ void POA_CORBA_SequenceDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference; @@ -13483,7 +13483,7 @@ void POA_CORBA_SequenceDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -13510,10 +13510,10 @@ void POA_CORBA_SequenceDef::_interface_skel ( CORBA::Boolean POA_CORBA_SequenceDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -13541,12 +13541,12 @@ void* POA_CORBA_SequenceDef::_downcast ( return 0; } -void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -13556,9 +13556,9 @@ const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const } CORBA_SequenceDef* -POA_CORBA_SequenceDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -13718,31 +13718,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::ULong result); @@ -13760,44 +13760,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_Arr TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -13809,7 +13809,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -13819,10 +13819,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -13840,31 +13840,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , const CORBA::ULong & length - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -13883,7 +13883,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl, const CORBA::ULong & length - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -13891,12 +13891,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -13912,25 +13912,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -13938,7 +13938,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -13948,10 +13948,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerRequestInfo @@ -13961,31 +13961,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -14003,44 +14003,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -14052,7 +14052,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -14062,10 +14062,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -14082,31 +14082,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -14124,44 +14124,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -14173,7 +14173,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -14183,10 +14183,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -14204,31 +14204,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl , CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -14247,7 +14247,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ArrayDef *tao_impl, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -14255,12 +14255,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -14276,25 +14276,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -14302,7 +14302,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -14312,10 +14312,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -14348,17 +14348,17 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::~_TAO_CORBA_ArrayDef_Strategized_P _TAO_CORBA_ArrayDef_Proxy_Impl& _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ArrayDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -14368,7 +14368,7 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -14438,7 +14438,7 @@ _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl ( CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14454,7 +14454,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( _collocated_tao_target_->_object_key (), "length", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -14463,14 +14463,14 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->length ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14484,7 +14484,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( _collocated_tao_target_->_object_key (), "length", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -14494,14 +14494,14 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( ) )->length ( length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14517,7 +14517,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type ( _collocated_tao_target_->_object_key (), "element_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -14526,13 +14526,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type ( "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14548,7 +14548,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( _collocated_tao_target_->_object_key (), "element_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -14557,14 +14557,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -14578,7 +14578,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( _collocated_tao_target_->_object_key (), "element_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -14588,7 +14588,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( ) )->element_type_def ( element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -14619,7 +14619,7 @@ void POA_CORBA_ArrayDef::_get_length_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = @@ -14640,18 +14640,18 @@ void POA_CORBA_ArrayDef::_get_length_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->length ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -14659,7 +14659,7 @@ void POA_CORBA_ArrayDef::_get_length_skel ( CORBA::ULong _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -14667,12 +14667,12 @@ void POA_CORBA_ArrayDef::_get_length_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14700,7 +14700,7 @@ void POA_CORBA_ArrayDef::_set_length_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -14729,25 +14729,25 @@ void POA_CORBA_ArrayDef::_set_length_skel ( _tao_upcall, _tao_impl, length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->length ( length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -14755,12 +14755,12 @@ void POA_CORBA_ArrayDef::_set_length_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14781,7 +14781,7 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = @@ -14802,18 +14802,18 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -14822,7 +14822,7 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -14830,12 +14830,12 @@ void POA_CORBA_ArrayDef::_get_element_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14863,7 +14863,7 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = @@ -14884,18 +14884,18 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -14904,7 +14904,7 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -14912,12 +14912,12 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -14945,7 +14945,7 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -14974,25 +14974,25 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( _tao_upcall, _tao_impl, element_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->element_type_def ( element_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -15000,12 +15000,12 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -15026,7 +15026,7 @@ void POA_CORBA_ArrayDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -15036,7 +15036,7 @@ void POA_CORBA_ArrayDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -15049,11 +15049,11 @@ void POA_CORBA_ArrayDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -15066,7 +15066,7 @@ void POA_CORBA_ArrayDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference; @@ -15085,7 +15085,7 @@ void POA_CORBA_ArrayDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -15112,10 +15112,10 @@ void POA_CORBA_ArrayDef::_interface_skel ( CORBA::Boolean POA_CORBA_ArrayDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -15143,12 +15143,12 @@ void* POA_CORBA_ArrayDef::_downcast ( return 0; } -void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -15158,9 +15158,9 @@ const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const } CORBA_ArrayDef* -POA_CORBA_ArrayDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -15348,31 +15348,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -15390,44 +15390,44 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_E TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ExceptionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -15439,7 +15439,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -15449,10 +15449,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -15469,31 +15469,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_StructMemberSeq * result); @@ -15511,44 +15511,44 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORB TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ExceptionDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -15560,7 +15560,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -15570,10 +15570,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -15591,31 +15591,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl , const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -15634,7 +15634,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ExceptionDef *tao_impl, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -15642,12 +15642,12 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -15663,25 +15663,25 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -15689,7 +15689,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -15699,10 +15699,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -15735,17 +15735,17 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Strat _TAO_CORBA_ExceptionDef_Proxy_Impl& _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ExceptionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -15755,7 +15755,7 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -15825,7 +15825,7 @@ _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ExceptionDef_ThruPOA_Prox CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -15841,7 +15841,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -15850,13 +15850,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/ExceptionDef:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -15872,7 +15872,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -15881,14 +15881,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( "IDL:omg.org/CORBA/ExceptionDef:1.0" ) )->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -15902,7 +15902,7 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( _collocated_tao_target_->_object_key (), "members", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -15912,7 +15912,7 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( ) )->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -15944,7 +15944,7 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ExceptionDef *_tao_impl = @@ -15965,18 +15965,18 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -15985,7 +15985,7 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -15993,12 +15993,12 @@ void POA_CORBA_ExceptionDef::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16026,7 +16026,7 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ExceptionDef *_tao_impl = @@ -16047,18 +16047,18 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -16067,7 +16067,7 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -16075,12 +16075,12 @@ void POA_CORBA_ExceptionDef::_get_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16108,7 +16108,7 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -16137,25 +16137,25 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( _tao_upcall, _tao_impl, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -16163,12 +16163,12 @@ void POA_CORBA_ExceptionDef::_set_members_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -16189,7 +16189,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -16199,7 +16199,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -16212,11 +16212,11 @@ void POA_CORBA_ExceptionDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -16229,7 +16229,7 @@ void POA_CORBA_ExceptionDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference; @@ -16248,7 +16248,7 @@ void POA_CORBA_ExceptionDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -16275,10 +16275,10 @@ void POA_CORBA_ExceptionDef::_interface_skel ( CORBA::Boolean POA_CORBA_ExceptionDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -16309,12 +16309,12 @@ void* POA_CORBA_ExceptionDef::_downcast ( return 0; } -void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -16324,9 +16324,9 @@ const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const } CORBA_ExceptionDef* -POA_CORBA_ExceptionDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -16497,31 +16497,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -16539,44 +16539,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_A TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16588,7 +16588,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -16598,10 +16598,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -16618,31 +16618,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -16660,44 +16660,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16709,7 +16709,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -16719,10 +16719,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -16740,31 +16740,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -16783,7 +16783,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -16791,12 +16791,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -16812,25 +16812,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -16838,7 +16838,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -16848,10 +16848,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerRequestInfo @@ -16861,31 +16861,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::AttributeMode result); @@ -16903,44 +16903,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_A TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -16952,7 +16952,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -16962,10 +16962,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -16983,31 +16983,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl , CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -17026,7 +17026,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_AttributeDef *tao_impl, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -17034,12 +17034,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -17055,25 +17055,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -17081,7 +17081,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -17091,10 +17091,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -17127,17 +17127,17 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::~_TAO_CORBA_AttributeDef_Strat _TAO_CORBA_AttributeDef_Proxy_Impl& _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_AttributeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -17147,7 +17147,7 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -17217,7 +17217,7 @@ _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AttributeDef_ThruPOA_Prox CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17233,7 +17233,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -17242,13 +17242,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17264,7 +17264,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -17273,14 +17273,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17294,7 +17294,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -17304,14 +17304,14 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( ) )->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17327,7 +17327,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( _collocated_tao_target_->_object_key (), "mode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -17336,14 +17336,14 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -17357,7 +17357,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( _collocated_tao_target_->_object_key (), "mode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -17367,7 +17367,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( ) )->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -17398,7 +17398,7 @@ void POA_CORBA_AttributeDef::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = @@ -17419,18 +17419,18 @@ void POA_CORBA_AttributeDef::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -17439,7 +17439,7 @@ void POA_CORBA_AttributeDef::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17447,12 +17447,12 @@ void POA_CORBA_AttributeDef::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17480,7 +17480,7 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = @@ -17501,18 +17501,18 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -17521,7 +17521,7 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17529,12 +17529,12 @@ void POA_CORBA_AttributeDef::_get_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17562,7 +17562,7 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -17591,25 +17591,25 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( _tao_upcall, _tao_impl, type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->type_def ( type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17617,12 +17617,12 @@ void POA_CORBA_AttributeDef::_set_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17643,7 +17643,7 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = @@ -17664,18 +17664,18 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -17683,7 +17683,7 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( CORBA::AttributeMode _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17691,12 +17691,12 @@ void POA_CORBA_AttributeDef::_get_mode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17724,7 +17724,7 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -17753,25 +17753,25 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( _tao_upcall, _tao_impl, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -17779,12 +17779,12 @@ void POA_CORBA_AttributeDef::_set_mode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -17805,7 +17805,7 @@ void POA_CORBA_AttributeDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -17815,7 +17815,7 @@ void POA_CORBA_AttributeDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -17828,11 +17828,11 @@ void POA_CORBA_AttributeDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -17845,7 +17845,7 @@ void POA_CORBA_AttributeDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference; @@ -17864,7 +17864,7 @@ void POA_CORBA_AttributeDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -17891,10 +17891,10 @@ void POA_CORBA_AttributeDef::_interface_skel ( CORBA::Boolean POA_CORBA_AttributeDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -17922,12 +17922,12 @@ void* POA_CORBA_AttributeDef::_downcast ( return 0; } -void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -17937,9 +17937,9 @@ const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const } CORBA_AttributeDef* -POA_CORBA_AttributeDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -18167,31 +18167,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -18209,44 +18209,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18258,7 +18258,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18268,10 +18268,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -18288,31 +18288,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -18330,44 +18330,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18379,7 +18379,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18389,10 +18389,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -18410,31 +18410,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -18453,7 +18453,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -18461,12 +18461,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -18482,25 +18482,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -18508,7 +18508,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18518,10 +18518,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerRequestInfo @@ -18531,31 +18531,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ParDescriptionSeq * result); @@ -18573,44 +18573,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18622,7 +18622,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18632,10 +18632,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -18653,31 +18653,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -18696,7 +18696,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -18704,12 +18704,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -18725,25 +18725,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -18751,7 +18751,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18761,10 +18761,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerRequestInfo @@ -18774,31 +18774,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::OperationMode result); @@ -18816,44 +18816,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_O TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -18865,7 +18865,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -18875,10 +18875,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -18896,31 +18896,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , CORBA::OperationMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -18939,7 +18939,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, CORBA::OperationMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -18947,12 +18947,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -18968,25 +18968,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -18994,7 +18994,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19004,10 +19004,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerRequestInfo @@ -19017,31 +19017,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ContextIdSeq * result); @@ -19059,44 +19059,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -19108,7 +19108,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19118,10 +19118,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -19139,31 +19139,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -19182,7 +19182,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -19190,12 +19190,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -19211,25 +19211,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -19237,7 +19237,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19247,10 +19247,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_ServerRequestInfo @@ -19260,31 +19260,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ExceptionDefSeq * result); @@ -19302,44 +19302,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -19351,7 +19351,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19361,10 +19361,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -19382,31 +19382,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl , const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -19425,7 +19425,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_OperationDef *tao_impl, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -19433,12 +19433,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -19454,25 +19454,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -19480,7 +19480,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -19490,10 +19490,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -19526,17 +19526,17 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::~_TAO_CORBA_OperationDef_Strat _TAO_CORBA_OperationDef_Proxy_Impl& _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_OperationDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -19546,7 +19546,7 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -19616,7 +19616,7 @@ _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::_TAO_CORBA_OperationDef_ThruPOA_Prox CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19632,7 +19632,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result ( _collocated_tao_target_->_object_key (), "result", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19641,13 +19641,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19663,7 +19663,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( _collocated_tao_target_->_object_key (), "result_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19672,14 +19672,14 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19693,7 +19693,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( _collocated_tao_target_->_object_key (), "result_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19703,14 +19703,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( ) )->result_def ( result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19726,7 +19726,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( _collocated_tao_target_->_object_key (), "params", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19735,14 +19735,14 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( CORBA_Object *_collocated_tao_target_, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19756,7 +19756,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( _collocated_tao_target_->_object_key (), "params", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19766,14 +19766,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( ) )->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19789,7 +19789,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( _collocated_tao_target_->_object_key (), "mode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -19798,14 +19798,14 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( CORBA_Object *_collocated_tao_target_, CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19819,7 +19819,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( _collocated_tao_target_->_object_key (), "mode", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19829,14 +19829,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( ) )->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19852,7 +19852,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( _collocated_tao_target_->_object_key (), "contexts", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19861,14 +19861,14 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( CORBA_Object *_collocated_tao_target_, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19882,7 +19882,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( _collocated_tao_target_->_object_key (), "contexts", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19892,14 +19892,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( ) )->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19915,7 +19915,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( _collocated_tao_target_->_object_key (), "exceptions", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -19924,14 +19924,14 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( "IDL:omg.org/CORBA/OperationDef:1.0" ) )->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( CORBA_Object *_collocated_tao_target_, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -19945,7 +19945,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( _collocated_tao_target_->_object_key (), "exceptions", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -19955,7 +19955,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( ) )->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -19986,7 +19986,7 @@ void POA_CORBA_OperationDef::_get_result_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20007,18 +20007,18 @@ void POA_CORBA_OperationDef::_get_result_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20027,7 +20027,7 @@ void POA_CORBA_OperationDef::_get_result_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20035,12 +20035,12 @@ void POA_CORBA_OperationDef::_get_result_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20068,7 +20068,7 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20089,18 +20089,18 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20109,7 +20109,7 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20117,12 +20117,12 @@ void POA_CORBA_OperationDef::_get_result_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20150,7 +20150,7 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20179,25 +20179,25 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( _tao_upcall, _tao_impl, result_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->result_def ( result_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20205,12 +20205,12 @@ void POA_CORBA_OperationDef::_set_result_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20231,7 +20231,7 @@ void POA_CORBA_OperationDef::_get_params_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20252,18 +20252,18 @@ void POA_CORBA_OperationDef::_get_params_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20272,7 +20272,7 @@ void POA_CORBA_OperationDef::_get_params_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20280,12 +20280,12 @@ void POA_CORBA_OperationDef::_get_params_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20313,7 +20313,7 @@ void POA_CORBA_OperationDef::_set_params_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20342,25 +20342,25 @@ void POA_CORBA_OperationDef::_set_params_skel ( _tao_upcall, _tao_impl, params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20368,12 +20368,12 @@ void POA_CORBA_OperationDef::_set_params_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20394,7 +20394,7 @@ void POA_CORBA_OperationDef::_get_mode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20415,18 +20415,18 @@ void POA_CORBA_OperationDef::_get_mode_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20434,7 +20434,7 @@ void POA_CORBA_OperationDef::_get_mode_skel ( CORBA::OperationMode _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20442,12 +20442,12 @@ void POA_CORBA_OperationDef::_get_mode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20475,7 +20475,7 @@ void POA_CORBA_OperationDef::_set_mode_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20504,25 +20504,25 @@ void POA_CORBA_OperationDef::_set_mode_skel ( _tao_upcall, _tao_impl, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20530,12 +20530,12 @@ void POA_CORBA_OperationDef::_set_mode_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20556,7 +20556,7 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20577,18 +20577,18 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20597,7 +20597,7 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20605,12 +20605,12 @@ void POA_CORBA_OperationDef::_get_contexts_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20638,7 +20638,7 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20667,25 +20667,25 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( _tao_upcall, _tao_impl, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20693,12 +20693,12 @@ void POA_CORBA_OperationDef::_set_contexts_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20719,7 +20719,7 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = @@ -20740,18 +20740,18 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -20760,7 +20760,7 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20768,12 +20768,12 @@ void POA_CORBA_OperationDef::_get_exceptions_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20801,7 +20801,7 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20830,25 +20830,25 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( _tao_upcall, _tao_impl, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -20856,12 +20856,12 @@ void POA_CORBA_OperationDef::_set_exceptions_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -20882,7 +20882,7 @@ void POA_CORBA_OperationDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -20892,7 +20892,7 @@ void POA_CORBA_OperationDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -20905,11 +20905,11 @@ void POA_CORBA_OperationDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -20922,7 +20922,7 @@ void POA_CORBA_OperationDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference; @@ -20941,7 +20941,7 @@ void POA_CORBA_OperationDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -20968,10 +20968,10 @@ void POA_CORBA_OperationDef::_interface_skel ( CORBA::Boolean POA_CORBA_OperationDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -20999,12 +20999,12 @@ void* POA_CORBA_OperationDef::_downcast ( return 0; } -void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -21014,9 +21014,9 @@ const char* POA_CORBA_OperationDef::_interface_repository_id (void) const } CORBA_OperationDef* -POA_CORBA_OperationDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -21209,31 +21209,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDefSeq * result); @@ -21251,44 +21251,44 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestI TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_InterfaceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21300,7 +21300,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21310,10 +21310,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -21331,31 +21331,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl , const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -21374,7 +21374,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_InterfaceDef *tao_impl, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -21382,12 +21382,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21403,25 +21403,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -21429,7 +21429,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SI char * TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21439,10 +21439,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestInfo @@ -21453,31 +21453,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl , const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -21497,7 +21497,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_InterfaceDef *tao_impl, const char * interface_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -21505,12 +21505,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21526,25 +21526,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DEC } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21556,7 +21556,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21566,10 +21566,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -21586,31 +21586,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDef::FullInterfaceDescription * result); @@ -21628,44 +21628,44 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestIn TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_InterfaceDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21677,7 +21677,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SIN char * TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21687,10 +21687,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -21712,31 +21712,31 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_AttributeDef_ptr result); @@ -21764,7 +21764,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -21776,12 +21776,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21809,25 +21809,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -21839,7 +21839,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -21849,10 +21849,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -21877,31 +21877,31 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_OperationDef_ptr result); @@ -21935,7 +21935,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -21950,12 +21950,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -21992,25 +21992,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SI } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -22022,7 +22022,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -22032,10 +22032,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -22075,17 +22075,17 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Strat _TAO_CORBA_InterfaceDef_Proxy_Impl& _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_InterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -22095,7 +22095,7 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -22165,7 +22165,7 @@ _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_InterfaceDef_ThruPOA_Prox CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22181,7 +22181,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa _collocated_tao_target_->_object_key (), "base_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -22190,14 +22190,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22211,7 +22211,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( _collocated_tao_target_->_object_key (), "base_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -22221,7 +22221,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( ) )->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -22229,7 +22229,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22245,7 +22245,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a ( _collocated_tao_target_->_object_key (), "is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -22255,13 +22255,13 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a ( ) )->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22277,7 +22277,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P _collocated_tao_target_->_object_key (), "describe_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -22286,7 +22286,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -22297,7 +22297,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22313,7 +22313,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib _collocated_tao_target_->_object_key (), "create_attribute", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -22327,7 +22327,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -22341,7 +22341,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -22357,7 +22357,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat _collocated_tao_target_->_object_key (), "create_operation", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -22374,7 +22374,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -22406,7 +22406,7 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef *_tao_impl = @@ -22427,18 +22427,18 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22447,7 +22447,7 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22455,12 +22455,12 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22488,7 +22488,7 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22517,25 +22517,25 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( _tao_upcall, _tao_impl, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22543,12 +22543,12 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22569,7 +22569,7 @@ void POA_CORBA_InterfaceDef::is_a_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22598,19 +22598,19 @@ void POA_CORBA_InterfaceDef::is_a_skel ( _tao_upcall, _tao_impl, interface_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_a ( interface_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22618,7 +22618,7 @@ void POA_CORBA_InterfaceDef::is_a_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22626,12 +22626,12 @@ void POA_CORBA_InterfaceDef::is_a_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22659,7 +22659,7 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef *_tao_impl = @@ -22680,18 +22680,18 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22700,7 +22700,7 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22708,12 +22708,12 @@ void POA_CORBA_InterfaceDef::describe_interface_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22741,7 +22741,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22782,12 +22782,12 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( version.in (), type.in (), mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -22798,7 +22798,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( version.in (), type.in (), mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22807,7 +22807,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22815,12 +22815,12 @@ void POA_CORBA_InterfaceDef::create_attribute_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22848,7 +22848,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22898,12 +22898,12 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -22917,7 +22917,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -22926,7 +22926,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -22934,12 +22934,12 @@ void POA_CORBA_InterfaceDef::create_operation_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -22967,7 +22967,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -22977,7 +22977,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -22990,11 +22990,11 @@ void POA_CORBA_InterfaceDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23007,7 +23007,7 @@ void POA_CORBA_InterfaceDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference; @@ -23026,7 +23026,7 @@ void POA_CORBA_InterfaceDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -23053,10 +23053,10 @@ void POA_CORBA_InterfaceDef::_interface_skel ( CORBA::Boolean POA_CORBA_InterfaceDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -23090,12 +23090,12 @@ void* POA_CORBA_InterfaceDef::_downcast ( return 0; } -void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -23105,9 +23105,9 @@ const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const } CORBA_InterfaceDef* -POA_CORBA_InterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -23323,17 +23323,17 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_AbstractIn _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl& _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_AbstractInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -23343,7 +23343,7 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -23440,7 +23440,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -23450,7 +23450,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23463,11 +23463,11 @@ void POA_CORBA_AbstractInterfaceDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23480,7 +23480,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference; @@ -23499,7 +23499,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -23526,10 +23526,10 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel ( CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -23566,12 +23566,12 @@ void* POA_CORBA_AbstractInterfaceDef::_downcast ( return 0; } -void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -23581,9 +23581,9 @@ const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) cons } CORBA_AbstractInterfaceDef* -POA_CORBA_AbstractInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -23799,17 +23799,17 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_LocalInterfac _TAO_CORBA_LocalInterfaceDef_Proxy_Impl& _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_LocalInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -23819,7 +23819,7 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -23916,7 +23916,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -23926,7 +23926,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23939,11 +23939,11 @@ void POA_CORBA_LocalInterfaceDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -23956,7 +23956,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference; @@ -23975,7 +23975,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -24002,10 +24002,10 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel ( CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -24042,12 +24042,12 @@ void* POA_CORBA_LocalInterfaceDef::_downcast ( return 0; } -void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -24057,9 +24057,9 @@ const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const } CORBA_LocalInterfaceDef* -POA_CORBA_LocalInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h index 5b95644bc38..eefdd907bda 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h @@ -65,7 +65,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -76,38 +76,38 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_Repository *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_Contained_ptr lookup_id ( const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -117,12 +117,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -132,12 +132,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -147,12 +147,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -162,12 +162,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -177,13 +177,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -193,13 +193,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -209,13 +209,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -225,140 +225,140 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -378,7 +378,7 @@ public: virtual ::_TAO_CORBA_Repository_Proxy_Impl &select_proxy ( ::CORBA_Repository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -387,7 +387,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -431,7 +431,7 @@ public: virtual CORBA_Contained_ptr lookup_id ( CORBA_Object *_collocated_tao_target_, const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -440,7 +440,7 @@ public: virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA_Object *_collocated_tao_target_, CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -449,7 +449,7 @@ public: virtual CORBA_PrimitiveDef_ptr get_primitive ( CORBA_Object *_collocated_tao_target_, CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -458,7 +458,7 @@ public: virtual CORBA_StringDef_ptr create_string ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -467,7 +467,7 @@ public: virtual CORBA_WstringDef_ptr create_wstring ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -477,7 +477,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -487,7 +487,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -497,7 +497,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -529,7 +529,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -540,31 +540,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ModuleDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -573,210 +573,210 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -796,7 +796,7 @@ public: virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy ( ::CORBA_ModuleDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -805,7 +805,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -872,7 +872,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -883,37 +883,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ConstantDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -923,11 +923,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -937,12 +937,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -952,11 +952,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Any * value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -966,12 +966,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void value ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -981,98 +981,98 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1092,7 +1092,7 @@ public: virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy ( ::CORBA_ConstantDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1101,7 +1101,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1144,7 +1144,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1152,7 +1152,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1161,7 +1161,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1169,7 +1169,7 @@ public: virtual CORBA::Any * value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1178,7 +1178,7 @@ public: virtual void value ( CORBA_Object *_collocated_tao_target_, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1210,7 +1210,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1221,37 +1221,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_StructDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1261,12 +1261,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1276,224 +1276,224 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1513,7 +1513,7 @@ public: virtual ::_TAO_CORBA_StructDef_Proxy_Impl &select_proxy ( ::CORBA_StructDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1522,7 +1522,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1566,7 +1566,7 @@ public: virtual CORBA_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1575,7 +1575,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1607,7 +1607,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1618,37 +1618,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_UnionDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1658,11 +1658,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1672,12 +1672,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1687,11 +1687,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_UnionMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1701,12 +1701,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void members ( const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1716,224 +1716,224 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1953,7 +1953,7 @@ public: virtual ::_TAO_CORBA_UnionDef_Proxy_Impl &select_proxy ( ::CORBA_UnionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1962,7 +1962,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2006,7 +2006,7 @@ public: virtual CORBA::TypeCode_ptr discriminator_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2014,7 +2014,7 @@ public: virtual CORBA_IDLType_ptr discriminator_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2023,7 +2023,7 @@ public: virtual void discriminator_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2031,7 +2031,7 @@ public: virtual CORBA_UnionMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2040,7 +2040,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2072,7 +2072,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2083,37 +2083,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_EnumDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_EnumMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2123,12 +2123,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void members ( const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2138,105 +2138,105 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2256,7 +2256,7 @@ public: virtual ::_TAO_CORBA_EnumDef_Proxy_Impl &select_proxy ( ::CORBA_EnumDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2265,7 +2265,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2308,7 +2308,7 @@ public: virtual CORBA_EnumMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2317,7 +2317,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2349,7 +2349,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2360,37 +2360,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_AliasDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2400,12 +2400,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2415,105 +2415,105 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2533,7 +2533,7 @@ public: virtual ::_TAO_CORBA_AliasDef_Proxy_Impl &select_proxy ( ::CORBA_AliasDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2542,7 +2542,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2585,7 +2585,7 @@ public: virtual CORBA_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2594,7 +2594,7 @@ public: virtual void original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2626,7 +2626,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2637,31 +2637,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_NativeDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -2670,98 +2670,98 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2781,7 +2781,7 @@ public: virtual ::_TAO_CORBA_NativeDef_Proxy_Impl &select_proxy ( ::CORBA_NativeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2790,7 +2790,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2856,7 +2856,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2867,37 +2867,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_PrimitiveDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::PrimitiveKind kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2907,28 +2907,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2948,7 +2948,7 @@ public: virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy ( ::CORBA_PrimitiveDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2957,7 +2957,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3000,7 +3000,7 @@ public: virtual CORBA::PrimitiveKind kind ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3032,7 +3032,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3043,37 +3043,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_StringDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3083,12 +3083,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3098,28 +3098,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3139,7 +3139,7 @@ public: virtual ::_TAO_CORBA_StringDef_Proxy_Impl &select_proxy ( ::CORBA_StringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3148,7 +3148,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3191,7 +3191,7 @@ public: virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3200,7 +3200,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3232,7 +3232,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3243,37 +3243,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_WstringDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3283,12 +3283,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3298,28 +3298,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3339,7 +3339,7 @@ public: virtual ::_TAO_CORBA_WstringDef_Proxy_Impl &select_proxy ( ::CORBA_WstringDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3348,7 +3348,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3391,7 +3391,7 @@ public: virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3400,7 +3400,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3432,7 +3432,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3443,37 +3443,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_SequenceDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3483,12 +3483,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3498,11 +3498,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3512,11 +3512,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3526,12 +3526,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3541,28 +3541,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3582,7 +3582,7 @@ public: virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy ( ::CORBA_SequenceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3591,7 +3591,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3634,7 +3634,7 @@ public: virtual CORBA::ULong bound ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3643,7 +3643,7 @@ public: virtual void bound ( CORBA_Object *_collocated_tao_target_, CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3651,7 +3651,7 @@ public: virtual CORBA::TypeCode_ptr element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3659,7 +3659,7 @@ public: virtual CORBA_IDLType_ptr element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3668,7 +3668,7 @@ public: virtual void element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3700,7 +3700,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3711,37 +3711,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ArrayDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::ULong length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3751,12 +3751,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void length ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3766,11 +3766,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3780,11 +3780,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3794,12 +3794,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3809,28 +3809,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3850,7 +3850,7 @@ public: virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy ( ::CORBA_ArrayDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3859,7 +3859,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3902,7 +3902,7 @@ public: virtual CORBA::ULong length ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3911,7 +3911,7 @@ public: virtual void length ( CORBA_Object *_collocated_tao_target_, CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3919,7 +3919,7 @@ public: virtual CORBA::TypeCode_ptr element_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3927,7 +3927,7 @@ public: virtual CORBA_IDLType_ptr element_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3936,7 +3936,7 @@ public: virtual void element_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3968,7 +3968,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3979,37 +3979,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ExceptionDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4019,11 +4019,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4033,12 +4033,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4048,217 +4048,217 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -4278,7 +4278,7 @@ public: virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy ( ::CORBA_ExceptionDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4287,7 +4287,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4331,7 +4331,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4339,7 +4339,7 @@ public: virtual CORBA_StructMemberSeq * members ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4348,7 +4348,7 @@ public: virtual void members ( CORBA_Object *_collocated_tao_target_, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4380,7 +4380,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -4391,37 +4391,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_AttributeDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4431,11 +4431,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4445,12 +4445,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4460,11 +4460,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::AttributeMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4474,12 +4474,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4489,98 +4489,98 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -4600,7 +4600,7 @@ public: virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy ( ::CORBA_AttributeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4609,7 +4609,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4652,7 +4652,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4660,7 +4660,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4669,7 +4669,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4677,7 +4677,7 @@ public: virtual CORBA::AttributeMode mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4686,7 +4686,7 @@ public: virtual void mode ( CORBA_Object *_collocated_tao_target_, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4718,7 +4718,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -4729,37 +4729,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_OperationDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4769,11 +4769,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4783,12 +4783,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4798,11 +4798,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4812,12 +4812,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4827,11 +4827,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4841,12 +4841,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4856,11 +4856,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4870,12 +4870,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4885,11 +4885,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4899,12 +4899,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4914,98 +4914,98 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -5025,7 +5025,7 @@ public: virtual ::_TAO_CORBA_OperationDef_Proxy_Impl &select_proxy ( ::CORBA_OperationDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5034,7 +5034,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5077,7 +5077,7 @@ public: virtual CORBA::TypeCode_ptr result ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5085,7 +5085,7 @@ public: virtual CORBA_IDLType_ptr result_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5094,7 +5094,7 @@ public: virtual void result_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5102,7 +5102,7 @@ public: virtual CORBA_ParDescriptionSeq * params ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5111,7 +5111,7 @@ public: virtual void params ( CORBA_Object *_collocated_tao_target_, const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5119,7 +5119,7 @@ public: virtual CORBA::OperationMode mode ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5128,7 +5128,7 @@ public: virtual void mode ( CORBA_Object *_collocated_tao_target_, CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5136,7 +5136,7 @@ public: virtual CORBA_ContextIdSeq * contexts ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5145,7 +5145,7 @@ public: virtual void contexts ( CORBA_Object *_collocated_tao_target_, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5153,7 +5153,7 @@ public: virtual CORBA_ExceptionDefSeq * exceptions ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5162,7 +5162,7 @@ public: virtual void exceptions ( CORBA_Object *_collocated_tao_target_, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5194,7 +5194,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -5205,37 +5205,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_InterfaceDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5245,12 +5245,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5260,12 +5260,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5275,11 +5275,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5289,7 +5289,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_AttributeDef_ptr create_attribute ( @@ -5298,7 +5298,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5308,7 +5308,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_OperationDef_ptr create_operation ( @@ -5320,7 +5320,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -5330,224 +5330,224 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -5567,7 +5567,7 @@ public: virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy ( ::CORBA_InterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5576,7 +5576,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -5621,7 +5621,7 @@ public: virtual CORBA_InterfaceDefSeq * base_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5630,7 +5630,7 @@ public: virtual void base_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5639,7 +5639,7 @@ public: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5647,7 +5647,7 @@ public: virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5660,7 +5660,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5676,7 +5676,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5708,7 +5708,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -5719,31 +5719,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_AbstractInterfaceDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -5752,259 +5752,259 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -6024,7 +6024,7 @@ public: virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy ( ::CORBA_AbstractInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -6033,7 +6033,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -6099,7 +6099,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -6110,31 +6110,31 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_LocalInterfaceDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -6143,259 +6143,259 @@ public: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -6415,7 +6415,7 @@ public: virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy ( ::CORBA_LocalInterfaceDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -6424,7 +6424,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i index 452b604e36f..9b6f1854e59 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_Repository::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_Repository::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_Repository::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_Repository::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_Repository::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_Repository::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_Repository::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_Repository::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_Repository::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_Repository::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_Repository::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_Repository::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_Repository::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_Repository::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_Repository::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_Repository::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_Repository::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj; @@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_Repository::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -316,14 +316,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -331,14 +331,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -346,14 +346,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -361,14 +361,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -376,14 +376,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -391,14 +391,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -406,14 +406,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -421,14 +421,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -436,14 +436,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -451,14 +451,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -466,14 +466,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -481,14 +481,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -496,14 +496,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -511,14 +511,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -526,14 +526,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -541,14 +541,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -556,14 +556,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -571,14 +571,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -586,14 +586,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -601,14 +601,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -616,14 +616,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -631,14 +631,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -646,14 +646,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -661,14 +661,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -676,14 +676,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -691,14 +691,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -706,14 +706,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -721,14 +721,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -736,14 +736,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj; @@ -751,14 +751,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -766,14 +766,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -781,14 +781,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -796,14 +796,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -811,14 +811,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -826,14 +826,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -841,14 +841,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -856,14 +856,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -871,14 +871,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -886,14 +886,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -901,14 +901,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -916,14 +916,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -931,14 +931,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj; @@ -946,14 +946,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -961,14 +961,14 @@ ACE_INLINE void POA_CORBA_StructDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -976,14 +976,14 @@ ACE_INLINE void POA_CORBA_StructDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -991,14 +991,14 @@ ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1006,14 +1006,14 @@ ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1021,14 +1021,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1036,14 +1036,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1051,14 +1051,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1066,14 +1066,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1081,14 +1081,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1096,14 +1096,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1111,14 +1111,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1126,14 +1126,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1141,14 +1141,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1156,14 +1156,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1171,14 +1171,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1186,14 +1186,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1201,14 +1201,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1216,14 +1216,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1231,14 +1231,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1246,14 +1246,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1261,14 +1261,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1276,14 +1276,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1291,14 +1291,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1306,14 +1306,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1321,14 +1321,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1336,14 +1336,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1351,14 +1351,14 @@ ACE_INLINE void POA_CORBA_StructDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1366,14 +1366,14 @@ ACE_INLINE void POA_CORBA_StructDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1381,14 +1381,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1396,14 +1396,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StructDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj; @@ -1411,14 +1411,14 @@ ACE_INLINE void POA_CORBA_StructDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1426,14 +1426,14 @@ ACE_INLINE void POA_CORBA_UnionDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1441,14 +1441,14 @@ ACE_INLINE void POA_CORBA_UnionDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1456,14 +1456,14 @@ ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1471,14 +1471,14 @@ ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1486,14 +1486,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1501,14 +1501,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1516,14 +1516,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1531,14 +1531,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1546,14 +1546,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1561,14 +1561,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1576,14 +1576,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1591,14 +1591,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1606,14 +1606,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1621,14 +1621,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1636,14 +1636,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1651,14 +1651,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1666,14 +1666,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1681,14 +1681,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1696,14 +1696,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1711,14 +1711,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1726,14 +1726,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1741,14 +1741,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1756,14 +1756,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1771,14 +1771,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1786,14 +1786,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1801,14 +1801,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1816,14 +1816,14 @@ ACE_INLINE void POA_CORBA_UnionDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1831,14 +1831,14 @@ ACE_INLINE void POA_CORBA_UnionDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1846,14 +1846,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1861,14 +1861,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_UnionDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj; @@ -1876,14 +1876,14 @@ ACE_INLINE void POA_CORBA_UnionDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1891,14 +1891,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1906,14 +1906,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1921,14 +1921,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1936,14 +1936,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1951,14 +1951,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1966,14 +1966,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1981,14 +1981,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -1996,14 +1996,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2011,14 +2011,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2026,14 +2026,14 @@ ACE_INLINE void POA_CORBA_EnumDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2041,14 +2041,14 @@ ACE_INLINE void POA_CORBA_EnumDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2056,14 +2056,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2071,14 +2071,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_EnumDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj; @@ -2086,14 +2086,14 @@ ACE_INLINE void POA_CORBA_EnumDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2101,14 +2101,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2116,14 +2116,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2131,14 +2131,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2146,14 +2146,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2161,14 +2161,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2176,14 +2176,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2191,14 +2191,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2206,14 +2206,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2221,14 +2221,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2236,14 +2236,14 @@ ACE_INLINE void POA_CORBA_AliasDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2251,14 +2251,14 @@ ACE_INLINE void POA_CORBA_AliasDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2266,14 +2266,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2281,14 +2281,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AliasDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj; @@ -2296,14 +2296,14 @@ ACE_INLINE void POA_CORBA_AliasDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2311,14 +2311,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2326,14 +2326,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2341,14 +2341,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2356,14 +2356,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2371,14 +2371,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2386,14 +2386,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2401,14 +2401,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2416,14 +2416,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2431,14 +2431,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2446,14 +2446,14 @@ ACE_INLINE void POA_CORBA_NativeDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2461,14 +2461,14 @@ ACE_INLINE void POA_CORBA_NativeDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2476,14 +2476,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2491,14 +2491,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_NativeDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj; @@ -2506,14 +2506,14 @@ ACE_INLINE void POA_CORBA_NativeDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj; @@ -2521,14 +2521,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj; @@ -2536,14 +2536,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj; @@ -2551,14 +2551,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StringDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_StringDef_ptr) obj; @@ -2566,14 +2566,14 @@ ACE_INLINE void POA_CORBA_StringDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj; @@ -2581,14 +2581,14 @@ ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_StringDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj; @@ -2596,14 +2596,14 @@ ACE_INLINE void POA_CORBA_StringDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_WstringDef_ptr) obj; @@ -2611,14 +2611,14 @@ ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj; @@ -2626,14 +2626,14 @@ ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_WstringDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj; @@ -2641,14 +2641,14 @@ ACE_INLINE void POA_CORBA_WstringDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_SequenceDef_ptr) obj; @@ -2656,14 +2656,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj; @@ -2671,14 +2671,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj; @@ -2686,14 +2686,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_ArrayDef_ptr) obj; @@ -2701,14 +2701,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj; @@ -2716,14 +2716,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj; @@ -2731,14 +2731,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2746,14 +2746,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2761,14 +2761,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2776,14 +2776,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2791,14 +2791,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2806,14 +2806,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2821,14 +2821,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2836,14 +2836,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2851,14 +2851,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2866,14 +2866,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2881,14 +2881,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2896,14 +2896,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2911,14 +2911,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2926,14 +2926,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2941,14 +2941,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2956,14 +2956,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2971,14 +2971,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -2986,14 +2986,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3001,14 +3001,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3016,14 +3016,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3031,14 +3031,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3046,14 +3046,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3061,14 +3061,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3076,14 +3076,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3091,14 +3091,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3106,14 +3106,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3121,14 +3121,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3136,14 +3136,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3151,14 +3151,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3166,14 +3166,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj; @@ -3181,14 +3181,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3196,14 +3196,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3211,14 +3211,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3226,14 +3226,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3241,14 +3241,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3256,14 +3256,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3271,14 +3271,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3286,14 +3286,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3301,14 +3301,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3316,14 +3316,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3331,14 +3331,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3346,14 +3346,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3361,14 +3361,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj; @@ -3376,14 +3376,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3391,14 +3391,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3406,14 +3406,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3421,14 +3421,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3436,14 +3436,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3451,14 +3451,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3466,14 +3466,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3481,14 +3481,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3496,14 +3496,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3511,14 +3511,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3526,14 +3526,14 @@ ACE_INLINE void POA_CORBA_OperationDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3541,14 +3541,14 @@ ACE_INLINE void POA_CORBA_OperationDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3556,14 +3556,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_OperationDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj; @@ -3571,14 +3571,14 @@ ACE_INLINE void POA_CORBA_OperationDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3586,14 +3586,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3601,14 +3601,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3616,14 +3616,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3631,14 +3631,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3646,14 +3646,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3661,14 +3661,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3676,14 +3676,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3691,14 +3691,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3706,14 +3706,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3721,14 +3721,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3736,14 +3736,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3751,14 +3751,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3766,14 +3766,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3781,14 +3781,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3796,14 +3796,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3811,14 +3811,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3826,14 +3826,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3841,14 +3841,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3856,14 +3856,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3871,14 +3871,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3886,14 +3886,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3901,14 +3901,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3916,14 +3916,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3931,14 +3931,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3946,14 +3946,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3961,14 +3961,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3976,14 +3976,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -3991,14 +3991,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -4006,14 +4006,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -4021,14 +4021,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj; @@ -4036,14 +4036,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4051,14 +4051,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4066,14 +4066,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4081,14 +4081,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4096,14 +4096,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4111,14 +4111,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4126,14 +4126,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4141,14 +4141,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4156,14 +4156,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4171,14 +4171,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4186,14 +4186,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4201,14 +4201,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4216,14 +4216,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4231,14 +4231,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4246,14 +4246,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4261,14 +4261,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4276,14 +4276,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4291,14 +4291,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4306,14 +4306,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4321,14 +4321,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4336,14 +4336,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4351,14 +4351,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4366,14 +4366,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4381,14 +4381,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4396,14 +4396,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4411,14 +4411,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4426,14 +4426,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4441,14 +4441,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4456,14 +4456,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4471,14 +4471,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4486,14 +4486,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4501,14 +4501,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4516,14 +4516,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4531,14 +4531,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4546,14 +4546,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4561,14 +4561,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4576,14 +4576,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj; @@ -4591,14 +4591,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4606,14 +4606,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4621,14 +4621,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4636,14 +4636,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4651,14 +4651,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4666,14 +4666,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4681,14 +4681,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4696,14 +4696,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4711,14 +4711,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4726,14 +4726,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4741,14 +4741,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4756,14 +4756,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4771,14 +4771,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4786,14 +4786,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4801,14 +4801,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4816,14 +4816,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4831,14 +4831,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4846,14 +4846,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4861,14 +4861,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4876,14 +4876,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4891,14 +4891,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4906,14 +4906,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4921,14 +4921,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4936,14 +4936,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4951,14 +4951,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4966,14 +4966,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4981,14 +4981,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -4996,14 +4996,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5011,14 +5011,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5026,14 +5026,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5041,14 +5041,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5056,14 +5056,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5071,14 +5071,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5086,14 +5086,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5101,14 +5101,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5116,14 +5116,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5131,14 +5131,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj; @@ -5146,6 +5146,6 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h index 84a6f1f22d9..a9e5d0de606 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h @@ -67,11 +67,11 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_Contained_ptr lookup_id ( const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -79,7 +79,7 @@ public: CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -87,7 +87,7 @@ public: CORBA_PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -95,7 +95,7 @@ public: CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -103,7 +103,7 @@ public: CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -112,7 +112,7 @@ public: CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -121,7 +121,7 @@ public: CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -130,7 +130,7 @@ public: CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -138,7 +138,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -147,7 +147,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -158,7 +158,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -168,7 +168,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -178,7 +178,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -190,7 +190,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -201,7 +201,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -213,7 +213,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -224,7 +224,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -235,7 +235,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -246,7 +246,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -263,7 +263,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -274,7 +274,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -285,7 +285,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -295,7 +295,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -306,7 +306,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -317,21 +317,21 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -377,11 +377,11 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -390,7 +390,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -401,7 +401,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -411,7 +411,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -421,7 +421,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -433,7 +433,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -444,7 +444,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -456,7 +456,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -467,7 +467,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -478,7 +478,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -489,7 +489,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -506,7 +506,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -517,7 +517,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -528,7 +528,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -538,7 +538,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -549,7 +549,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -560,14 +560,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -575,14 +575,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -590,14 +590,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -605,35 +605,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -643,21 +643,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -703,17 +703,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -721,14 +721,14 @@ public: void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Any * value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -736,14 +736,14 @@ public: void value ( const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -751,14 +751,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -766,14 +766,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -781,35 +781,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -819,21 +819,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -879,10 +879,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -890,7 +890,7 @@ public: void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -898,7 +898,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -907,7 +907,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -918,7 +918,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -928,7 +928,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -938,7 +938,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -950,7 +950,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -961,7 +961,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -973,7 +973,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -984,7 +984,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -995,7 +995,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1006,7 +1006,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1023,7 +1023,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1034,7 +1034,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1045,7 +1045,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1055,7 +1055,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1066,7 +1066,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1077,14 +1077,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1092,14 +1092,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1107,14 +1107,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1122,35 +1122,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1160,28 +1160,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1227,17 +1227,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1245,14 +1245,14 @@ public: void discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_UnionMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1260,7 +1260,7 @@ public: void members ( const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1268,7 +1268,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1277,7 +1277,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1288,7 +1288,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1298,7 +1298,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1308,7 +1308,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1320,7 +1320,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1331,7 +1331,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1343,7 +1343,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1354,7 +1354,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1365,7 +1365,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1376,7 +1376,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1393,7 +1393,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1404,7 +1404,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1415,7 +1415,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1425,7 +1425,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1436,7 +1436,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1447,14 +1447,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1462,14 +1462,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1477,14 +1477,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1492,35 +1492,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1530,28 +1530,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1597,10 +1597,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_EnumMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1608,14 +1608,14 @@ public: void members ( const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1623,14 +1623,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1638,14 +1638,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1653,35 +1653,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1691,28 +1691,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1758,10 +1758,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1769,14 +1769,14 @@ public: void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1784,14 +1784,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1799,14 +1799,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1814,35 +1814,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1852,28 +1852,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1919,10 +1919,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1930,14 +1930,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1945,14 +1945,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1960,35 +1960,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1998,28 +1998,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2065,31 +2065,31 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::PrimitiveKind kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2135,10 +2135,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2146,28 +2146,28 @@ public: void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2213,10 +2213,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2224,28 +2224,28 @@ public: void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2291,10 +2291,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2302,21 +2302,21 @@ public: void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2324,28 +2324,28 @@ public: void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2391,10 +2391,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::ULong length ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2402,21 +2402,21 @@ public: void length ( CORBA::ULong length - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2424,28 +2424,28 @@ public: void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2491,17 +2491,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_StructMemberSeq * members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2509,14 +2509,14 @@ public: void members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2524,14 +2524,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2539,14 +2539,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2554,35 +2554,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2592,7 +2592,7 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2600,7 +2600,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2609,7 +2609,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2620,7 +2620,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2630,7 +2630,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2640,7 +2640,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2652,7 +2652,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2663,7 +2663,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2675,7 +2675,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2686,7 +2686,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2697,7 +2697,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2708,7 +2708,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2725,7 +2725,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2736,7 +2736,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2747,7 +2747,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2757,7 +2757,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2768,7 +2768,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2779,21 +2779,21 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2839,17 +2839,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2857,14 +2857,14 @@ public: void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::AttributeMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2872,14 +2872,14 @@ public: void mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2887,14 +2887,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2902,14 +2902,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2917,35 +2917,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2955,21 +2955,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3015,17 +3015,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3033,14 +3033,14 @@ public: void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3048,14 +3048,14 @@ public: void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3063,14 +3063,14 @@ public: void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3078,14 +3078,14 @@ public: void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3093,14 +3093,14 @@ public: void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3108,14 +3108,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3123,14 +3123,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3138,35 +3138,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3176,21 +3176,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3236,10 +3236,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3247,7 +3247,7 @@ public: void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3255,14 +3255,14 @@ public: CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3274,7 +3274,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3289,7 +3289,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3297,7 +3297,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3306,7 +3306,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3317,7 +3317,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3327,7 +3327,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3337,7 +3337,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3349,7 +3349,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3360,7 +3360,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3372,7 +3372,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3383,7 +3383,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3394,7 +3394,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3405,7 +3405,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3422,7 +3422,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3433,7 +3433,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3444,7 +3444,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3454,7 +3454,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3465,7 +3465,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3476,14 +3476,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3491,14 +3491,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3506,14 +3506,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3521,35 +3521,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3559,28 +3559,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3626,10 +3626,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3637,7 +3637,7 @@ public: void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3645,14 +3645,14 @@ public: CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3664,7 +3664,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3679,7 +3679,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3687,7 +3687,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3696,7 +3696,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3707,7 +3707,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3717,7 +3717,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3727,7 +3727,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3739,7 +3739,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3750,7 +3750,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3762,7 +3762,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3773,7 +3773,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3784,7 +3784,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3795,7 +3795,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3812,7 +3812,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3823,7 +3823,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3834,7 +3834,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3844,7 +3844,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3855,7 +3855,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3866,14 +3866,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3881,14 +3881,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3896,14 +3896,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3911,35 +3911,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3949,28 +3949,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4016,10 +4016,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4027,7 +4027,7 @@ public: void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4035,14 +4035,14 @@ public: CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4054,7 +4054,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4069,7 +4069,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4077,7 +4077,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4086,7 +4086,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4097,7 +4097,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4107,7 +4107,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4117,7 +4117,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4129,7 +4129,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4140,7 +4140,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4152,7 +4152,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4163,7 +4163,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4174,7 +4174,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4185,7 +4185,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4202,7 +4202,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4213,7 +4213,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4224,7 +4224,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4234,7 +4234,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4245,7 +4245,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4256,14 +4256,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4271,14 +4271,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4286,14 +4286,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4301,35 +4301,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -4339,28 +4339,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i index ca9953d37d4..1c872d26eb9 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i @@ -90,18 +90,18 @@ POA_CORBA_Repository_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_Repository_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Repository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_Repository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup_id ( const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -109,14 +109,14 @@ CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup_id ( { return this->ptr_->lookup_id ( search_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_Repository_tie<T>::get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -124,14 +124,14 @@ CORBA::TypeCode_ptr POA_CORBA_Repository_tie<T>::get_canonical_typecode ( { return this->ptr_->get_canonical_typecode ( tc - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie<T>::get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -139,14 +139,14 @@ CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie<T>::get_primitive ( { return this->ptr_->get_primitive ( kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_StringDef_ptr POA_CORBA_Repository_tie<T>::create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -154,14 +154,14 @@ CORBA_StringDef_ptr POA_CORBA_Repository_tie<T>::create_string ( { return this->ptr_->create_string ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_WstringDef_ptr POA_CORBA_Repository_tie<T>::create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -169,7 +169,7 @@ CORBA_WstringDef_ptr POA_CORBA_Repository_tie<T>::create_wstring ( { return this->ptr_->create_wstring ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -177,7 +177,7 @@ template <class T> ACE_INLINE CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -186,7 +186,7 @@ CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence ( return this->ptr_->create_sequence ( bound, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -194,7 +194,7 @@ template <class T> ACE_INLINE CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -203,7 +203,7 @@ CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array ( return this->ptr_->create_array ( length, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -211,7 +211,7 @@ template <class T> ACE_INLINE CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -220,14 +220,14 @@ CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed ( return this->ptr_->create_fixed ( digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -235,7 +235,7 @@ CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -243,7 +243,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -252,7 +252,7 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -262,7 +262,7 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -273,7 +273,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -282,7 +282,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -292,7 +292,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -301,7 +301,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -311,7 +311,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -322,7 +322,7 @@ CORBA_ConstantDef_ptr POA_CORBA_Repository_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -334,7 +334,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -344,7 +344,7 @@ CORBA_StructDef_ptr POA_CORBA_Repository_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -355,7 +355,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -366,7 +366,7 @@ CORBA_UnionDef_ptr POA_CORBA_Repository_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -378,7 +378,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -388,7 +388,7 @@ CORBA_EnumDef_ptr POA_CORBA_Repository_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -399,7 +399,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -409,7 +409,7 @@ CORBA_AliasDef_ptr POA_CORBA_Repository_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -420,7 +420,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -430,7 +430,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -441,7 +441,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -457,7 +457,7 @@ CORBA_ValueDef_ptr POA_CORBA_Repository_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -474,7 +474,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -484,7 +484,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Repository_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -495,7 +495,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -505,7 +505,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_Repository_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -516,7 +516,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -525,7 +525,7 @@ CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -535,7 +535,7 @@ CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -545,7 +545,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_abstract_inte const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -556,7 +556,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -566,7 +566,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -577,33 +577,33 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_Repository_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_Repository_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -676,18 +676,18 @@ POA_CORBA_ModuleDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ModuleDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ModuleDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ModuleDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_ModuleDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -695,7 +695,7 @@ CORBA_Contained_ptr POA_CORBA_ModuleDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -703,7 +703,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -712,7 +712,7 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -722,7 +722,7 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -733,7 +733,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -742,7 +742,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -752,7 +752,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -761,7 +761,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -771,7 +771,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -782,7 +782,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ModuleDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -794,7 +794,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -804,7 +804,7 @@ CORBA_StructDef_ptr POA_CORBA_ModuleDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -815,7 +815,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -826,7 +826,7 @@ CORBA_UnionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -838,7 +838,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -848,7 +848,7 @@ CORBA_EnumDef_ptr POA_CORBA_ModuleDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -859,7 +859,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -869,7 +869,7 @@ CORBA_AliasDef_ptr POA_CORBA_ModuleDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -880,7 +880,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -890,7 +890,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -901,7 +901,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -917,7 +917,7 @@ CORBA_ValueDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -934,7 +934,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -944,7 +944,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -955,7 +955,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -965,7 +965,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -976,7 +976,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -985,7 +985,7 @@ CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -995,7 +995,7 @@ CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1005,7 +1005,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_abstract_inter const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1016,7 +1016,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1026,7 +1026,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1037,27 +1037,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ModuleDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ModuleDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1065,27 +1065,27 @@ void POA_CORBA_ModuleDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ModuleDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ModuleDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1093,27 +1093,27 @@ void POA_CORBA_ModuleDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ModuleDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ModuleDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1121,59 +1121,59 @@ void POA_CORBA_ModuleDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_ModuleDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ModuleDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_ModuleDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_ModuleDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1182,7 +1182,7 @@ void POA_CORBA_ModuleDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1192,33 +1192,33 @@ void POA_CORBA_ModuleDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_ModuleDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ModuleDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1291,44 +1291,44 @@ POA_CORBA_ConstantDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ConstantDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ConstantDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ConstantDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ConstantDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ConstantDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_ConstantDef_tie<T>::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ConstantDef_tie<T>::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1336,27 +1336,27 @@ void POA_CORBA_ConstantDef_tie<T>::type_def ( { this->ptr_->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Any * POA_CORBA_ConstantDef_tie<T>::value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ConstantDef_tie<T>::value ( const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1364,27 +1364,27 @@ void POA_CORBA_ConstantDef_tie<T>::value ( { this->ptr_->value ( value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ConstantDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ConstantDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1392,27 +1392,27 @@ void POA_CORBA_ConstantDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ConstantDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ConstantDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1420,27 +1420,27 @@ void POA_CORBA_ConstantDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ConstantDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ConstantDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1448,59 +1448,59 @@ void POA_CORBA_ConstantDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_ConstantDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ConstantDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_ConstantDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_ConstantDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1509,7 +1509,7 @@ void POA_CORBA_ConstantDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1519,33 +1519,33 @@ void POA_CORBA_ConstantDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_ConstantDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ConstantDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1618,31 +1618,31 @@ POA_CORBA_StructDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_StructDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_StructDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_StructDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_StructDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_StructMemberSeq * POA_CORBA_StructDef_tie<T>::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_StructDef_tie<T>::members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1650,14 +1650,14 @@ void POA_CORBA_StructDef_tie<T>::members ( { this->ptr_->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_StructDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1665,7 +1665,7 @@ CORBA_Contained_ptr POA_CORBA_StructDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1673,7 +1673,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1682,7 +1682,7 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1692,7 +1692,7 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1703,7 +1703,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1712,7 +1712,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1722,7 +1722,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1731,7 +1731,7 @@ CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1741,7 +1741,7 @@ CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1752,7 +1752,7 @@ CORBA_ConstantDef_ptr POA_CORBA_StructDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1764,7 +1764,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1774,7 +1774,7 @@ CORBA_StructDef_ptr POA_CORBA_StructDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1785,7 +1785,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1796,7 +1796,7 @@ CORBA_UnionDef_ptr POA_CORBA_StructDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1808,7 +1808,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1818,7 +1818,7 @@ CORBA_EnumDef_ptr POA_CORBA_StructDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1829,7 +1829,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1839,7 +1839,7 @@ CORBA_AliasDef_ptr POA_CORBA_StructDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1850,7 +1850,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1860,7 +1860,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1871,7 +1871,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1887,7 +1887,7 @@ CORBA_ValueDef_ptr POA_CORBA_StructDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1904,7 +1904,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1914,7 +1914,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_StructDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1925,7 +1925,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1935,7 +1935,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_StructDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1946,7 +1946,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1955,7 +1955,7 @@ CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1965,7 +1965,7 @@ CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1975,7 +1975,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_abstract_inter const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1986,7 +1986,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1996,7 +1996,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2007,27 +2007,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_StructDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_StructDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2035,27 +2035,27 @@ void POA_CORBA_StructDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_StructDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_StructDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2063,27 +2063,27 @@ void POA_CORBA_StructDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_StructDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_StructDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2091,59 +2091,59 @@ void POA_CORBA_StructDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_StructDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_StructDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_StructDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_StructDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2152,7 +2152,7 @@ void POA_CORBA_StructDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2162,46 +2162,46 @@ void POA_CORBA_StructDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_StructDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_StructDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_StructDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2274,44 +2274,44 @@ POA_CORBA_UnionDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_UnionDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_UnionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_UnionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_UnionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->discriminator_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->discriminator_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_UnionDef_tie<T>::discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2319,27 +2319,27 @@ void POA_CORBA_UnionDef_tie<T>::discriminator_type_def ( { this->ptr_->discriminator_type_def ( discriminator_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_UnionMemberSeq * POA_CORBA_UnionDef_tie<T>::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_UnionDef_tie<T>::members ( const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2347,14 +2347,14 @@ void POA_CORBA_UnionDef_tie<T>::members ( { this->ptr_->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_UnionDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2362,7 +2362,7 @@ CORBA_Contained_ptr POA_CORBA_UnionDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2370,7 +2370,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2379,7 +2379,7 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2389,7 +2389,7 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2400,7 +2400,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2409,7 +2409,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2419,7 +2419,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2428,7 +2428,7 @@ CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2438,7 +2438,7 @@ CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2449,7 +2449,7 @@ CORBA_ConstantDef_ptr POA_CORBA_UnionDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2461,7 +2461,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2471,7 +2471,7 @@ CORBA_StructDef_ptr POA_CORBA_UnionDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2482,7 +2482,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2493,7 +2493,7 @@ CORBA_UnionDef_ptr POA_CORBA_UnionDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2505,7 +2505,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2515,7 +2515,7 @@ CORBA_EnumDef_ptr POA_CORBA_UnionDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2526,7 +2526,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2536,7 +2536,7 @@ CORBA_AliasDef_ptr POA_CORBA_UnionDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2547,7 +2547,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2557,7 +2557,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2568,7 +2568,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2584,7 +2584,7 @@ CORBA_ValueDef_ptr POA_CORBA_UnionDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2601,7 +2601,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2611,7 +2611,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_UnionDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2622,7 +2622,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2632,7 +2632,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_UnionDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2643,7 +2643,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2652,7 +2652,7 @@ CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2662,7 +2662,7 @@ CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2672,7 +2672,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_abstract_interf const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2683,7 +2683,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2693,7 +2693,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_local_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2704,27 +2704,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_UnionDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_UnionDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2732,27 +2732,27 @@ void POA_CORBA_UnionDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_UnionDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_UnionDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2760,27 +2760,27 @@ void POA_CORBA_UnionDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_UnionDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_UnionDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2788,59 +2788,59 @@ void POA_CORBA_UnionDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_UnionDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_UnionDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_UnionDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_UnionDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2849,7 +2849,7 @@ void POA_CORBA_UnionDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2859,46 +2859,46 @@ void POA_CORBA_UnionDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_UnionDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_UnionDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2971,31 +2971,31 @@ POA_CORBA_EnumDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_EnumDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_EnumDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_EnumDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_EnumDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_EnumMemberSeq * POA_CORBA_EnumDef_tie<T>::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_EnumDef_tie<T>::members ( const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3003,27 +3003,27 @@ void POA_CORBA_EnumDef_tie<T>::members ( { this->ptr_->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_EnumDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_EnumDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3031,27 +3031,27 @@ void POA_CORBA_EnumDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_EnumDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_EnumDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3059,27 +3059,27 @@ void POA_CORBA_EnumDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_EnumDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_EnumDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3087,59 +3087,59 @@ void POA_CORBA_EnumDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_EnumDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_EnumDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_EnumDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_EnumDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3148,7 +3148,7 @@ void POA_CORBA_EnumDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3158,46 +3158,46 @@ void POA_CORBA_EnumDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_EnumDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_EnumDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_EnumDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3270,31 +3270,31 @@ POA_CORBA_AliasDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_AliasDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AliasDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_AliasDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_AliasDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_AliasDef_tie<T>::original_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AliasDef_tie<T>::original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3302,27 +3302,27 @@ void POA_CORBA_AliasDef_tie<T>::original_type_def ( { this->ptr_->original_type_def ( original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AliasDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AliasDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3330,27 +3330,27 @@ void POA_CORBA_AliasDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AliasDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AliasDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3358,27 +3358,27 @@ void POA_CORBA_AliasDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AliasDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AliasDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3386,59 +3386,59 @@ void POA_CORBA_AliasDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_AliasDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AliasDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_AliasDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_AliasDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3447,7 +3447,7 @@ void POA_CORBA_AliasDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3457,46 +3457,46 @@ void POA_CORBA_AliasDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_AliasDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_AliasDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AliasDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3569,31 +3569,31 @@ POA_CORBA_NativeDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_NativeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_NativeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_NativeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_NativeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE char * POA_CORBA_NativeDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_NativeDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3601,27 +3601,27 @@ void POA_CORBA_NativeDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_NativeDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_NativeDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3629,27 +3629,27 @@ void POA_CORBA_NativeDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_NativeDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_NativeDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3657,59 +3657,59 @@ void POA_CORBA_NativeDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_NativeDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_NativeDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_NativeDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_NativeDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3718,7 +3718,7 @@ void POA_CORBA_NativeDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3728,46 +3728,46 @@ void POA_CORBA_NativeDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_NativeDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_NativeDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_NativeDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3840,63 +3840,63 @@ POA_CORBA_PrimitiveDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_PrimitiveDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_PrimitiveDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_PrimitiveDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_PrimitiveDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::PrimitiveKind POA_CORBA_PrimitiveDef_tie<T>::kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_PrimitiveDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_PrimitiveDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_PrimitiveDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3969,31 +3969,31 @@ POA_CORBA_StringDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_StringDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_StringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_StringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_StringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::ULong POA_CORBA_StringDef_tie<T>::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_StringDef_tie<T>::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4001,46 +4001,46 @@ void POA_CORBA_StringDef_tie<T>::bound ( { this->ptr_->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_StringDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_StringDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_StringDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4113,31 +4113,31 @@ POA_CORBA_WstringDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_WstringDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_WstringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_WstringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_WstringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::ULong POA_CORBA_WstringDef_tie<T>::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_WstringDef_tie<T>::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4145,46 +4145,46 @@ void POA_CORBA_WstringDef_tie<T>::bound ( { this->ptr_->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_WstringDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_WstringDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_WstringDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4257,31 +4257,31 @@ POA_CORBA_SequenceDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_SequenceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_SequenceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_SequenceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_SequenceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::ULong POA_CORBA_SequenceDef_tie<T>::bound ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->bound ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_SequenceDef_tie<T>::bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4289,40 +4289,40 @@ void POA_CORBA_SequenceDef_tie<T>::bound ( { this->ptr_->bound ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::element_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_SequenceDef_tie<T>::element_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_SequenceDef_tie<T>::element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4330,46 +4330,46 @@ void POA_CORBA_SequenceDef_tie<T>::element_type_def ( { this->ptr_->element_type_def ( element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_SequenceDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_SequenceDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4442,31 +4442,31 @@ POA_CORBA_ArrayDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ArrayDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ArrayDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ArrayDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ArrayDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::ULong POA_CORBA_ArrayDef_tie<T>::length ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->length ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ArrayDef_tie<T>::length ( CORBA::ULong length - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4474,40 +4474,40 @@ void POA_CORBA_ArrayDef_tie<T>::length ( { this->ptr_->length ( length - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::element_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->element_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_ArrayDef_tie<T>::element_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->element_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ArrayDef_tie<T>::element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4515,46 +4515,46 @@ void POA_CORBA_ArrayDef_tie<T>::element_type_def ( { this->ptr_->element_type_def ( element_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_ArrayDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ArrayDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4627,44 +4627,44 @@ POA_CORBA_ExceptionDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ExceptionDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ExceptionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ExceptionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ExceptionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ExceptionDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_StructMemberSeq * POA_CORBA_ExceptionDef_tie<T>::members ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->members ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ExceptionDef_tie<T>::members ( const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4672,27 +4672,27 @@ void POA_CORBA_ExceptionDef_tie<T>::members ( { this->ptr_->members ( members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ExceptionDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ExceptionDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4700,27 +4700,27 @@ void POA_CORBA_ExceptionDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ExceptionDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ExceptionDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4728,27 +4728,27 @@ void POA_CORBA_ExceptionDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ExceptionDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ExceptionDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4756,59 +4756,59 @@ void POA_CORBA_ExceptionDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_ExceptionDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ExceptionDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_ExceptionDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_ExceptionDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4817,7 +4817,7 @@ void POA_CORBA_ExceptionDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4827,14 +4827,14 @@ void POA_CORBA_ExceptionDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4842,7 +4842,7 @@ CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4850,7 +4850,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4859,7 +4859,7 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4869,7 +4869,7 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4880,7 +4880,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4889,7 +4889,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_conten CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4899,7 +4899,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_conten limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4908,7 +4908,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4918,7 +4918,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4929,7 +4929,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4941,7 +4941,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4951,7 +4951,7 @@ CORBA_StructDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4962,7 +4962,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4973,7 +4973,7 @@ CORBA_UnionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4985,7 +4985,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4995,7 +4995,7 @@ CORBA_EnumDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5006,7 +5006,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5016,7 +5016,7 @@ CORBA_AliasDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5027,7 +5027,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5037,7 +5037,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5048,7 +5048,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5064,7 +5064,7 @@ CORBA_ValueDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5081,7 +5081,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5091,7 +5091,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5102,7 +5102,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5112,7 +5112,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5123,7 +5123,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5132,7 +5132,7 @@ CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5142,7 +5142,7 @@ CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5152,7 +5152,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_abstract_in const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5163,7 +5163,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5173,7 +5173,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_local_interfac const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5184,33 +5184,33 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_ExceptionDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ExceptionDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5283,44 +5283,44 @@ POA_CORBA_AttributeDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_AttributeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AttributeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_AttributeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_AttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_AttributeDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_AttributeDef_tie<T>::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AttributeDef_tie<T>::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5328,27 +5328,27 @@ void POA_CORBA_AttributeDef_tie<T>::type_def ( { this->ptr_->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::AttributeMode POA_CORBA_AttributeDef_tie<T>::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AttributeDef_tie<T>::mode ( CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5356,27 +5356,27 @@ void POA_CORBA_AttributeDef_tie<T>::mode ( { this->ptr_->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AttributeDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AttributeDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5384,27 +5384,27 @@ void POA_CORBA_AttributeDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AttributeDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AttributeDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5412,27 +5412,27 @@ void POA_CORBA_AttributeDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AttributeDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AttributeDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5440,59 +5440,59 @@ void POA_CORBA_AttributeDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_AttributeDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AttributeDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_AttributeDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_AttributeDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5501,7 +5501,7 @@ void POA_CORBA_AttributeDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5511,33 +5511,33 @@ void POA_CORBA_AttributeDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_AttributeDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AttributeDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5610,44 +5610,44 @@ POA_CORBA_OperationDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_OperationDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_OperationDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_OperationDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_OperationDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_OperationDef_tie<T>::result ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_OperationDef_tie<T>::result_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5655,27 +5655,27 @@ void POA_CORBA_OperationDef_tie<T>::result_def ( { this->ptr_->result_def ( result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ParDescriptionSeq * POA_CORBA_OperationDef_tie<T>::params ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5683,27 +5683,27 @@ void POA_CORBA_OperationDef_tie<T>::params ( { this->ptr_->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::OperationMode POA_CORBA_OperationDef_tie<T>::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5711,27 +5711,27 @@ void POA_CORBA_OperationDef_tie<T>::mode ( { this->ptr_->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ContextIdSeq * POA_CORBA_OperationDef_tie<T>::contexts ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5739,27 +5739,27 @@ void POA_CORBA_OperationDef_tie<T>::contexts ( { this->ptr_->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ExceptionDefSeq * POA_CORBA_OperationDef_tie<T>::exceptions ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5767,27 +5767,27 @@ void POA_CORBA_OperationDef_tie<T>::exceptions ( { this->ptr_->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_OperationDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5795,27 +5795,27 @@ void POA_CORBA_OperationDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_OperationDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5823,27 +5823,27 @@ void POA_CORBA_OperationDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_OperationDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5851,59 +5851,59 @@ void POA_CORBA_OperationDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_OperationDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_OperationDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_OperationDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_OperationDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5912,7 +5912,7 @@ void POA_CORBA_OperationDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5922,33 +5922,33 @@ void POA_CORBA_OperationDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_OperationDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_OperationDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6021,31 +6021,31 @@ POA_CORBA_InterfaceDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_InterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_InterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_InterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_InterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_InterfaceDefSeq * POA_CORBA_InterfaceDef_tie<T>::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_InterfaceDef_tie<T>::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6053,14 +6053,14 @@ void POA_CORBA_InterfaceDef_tie<T>::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_CORBA_InterfaceDef_tie<T>::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6068,20 +6068,20 @@ CORBA::Boolean POA_CORBA_InterfaceDef_tie<T>::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_InterfaceDef_tie<T>::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6092,7 +6092,7 @@ CORBA_AttributeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6104,7 +6104,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6118,7 +6118,7 @@ CORBA_OperationDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6133,14 +6133,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6148,7 +6148,7 @@ CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6156,7 +6156,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6165,7 +6165,7 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6175,7 +6175,7 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6186,7 +6186,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6195,7 +6195,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_conten CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6205,7 +6205,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_conten limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6214,7 +6214,7 @@ CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6224,7 +6224,7 @@ CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6235,7 +6235,7 @@ CORBA_ConstantDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6247,7 +6247,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6257,7 +6257,7 @@ CORBA_StructDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6268,7 +6268,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6279,7 +6279,7 @@ CORBA_UnionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6291,7 +6291,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6301,7 +6301,7 @@ CORBA_EnumDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6312,7 +6312,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6322,7 +6322,7 @@ CORBA_AliasDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6333,7 +6333,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6343,7 +6343,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6354,7 +6354,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6370,7 +6370,7 @@ CORBA_ValueDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6387,7 +6387,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6397,7 +6397,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6408,7 +6408,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6418,7 +6418,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6429,7 +6429,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6438,7 +6438,7 @@ CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6448,7 +6448,7 @@ CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6458,7 +6458,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_abstract_in const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6469,7 +6469,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6479,7 +6479,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_local_interfac const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6490,27 +6490,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_InterfaceDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_InterfaceDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6518,27 +6518,27 @@ void POA_CORBA_InterfaceDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_InterfaceDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_InterfaceDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6546,27 +6546,27 @@ void POA_CORBA_InterfaceDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_InterfaceDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_InterfaceDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6574,59 +6574,59 @@ void POA_CORBA_InterfaceDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_InterfaceDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_InterfaceDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_InterfaceDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_InterfaceDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6635,7 +6635,7 @@ void POA_CORBA_InterfaceDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6645,46 +6645,46 @@ void POA_CORBA_InterfaceDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_InterfaceDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_InterfaceDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_InterfaceDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6757,31 +6757,31 @@ POA_CORBA_AbstractInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_AbstractInterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_AbstractInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_AbstractInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_AbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_InterfaceDefSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6789,14 +6789,14 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie<T>::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6804,20 +6804,20 @@ CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie<T>::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_AbstractInterfaceDef_tie<T>::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6828,7 +6828,7 @@ CORBA_AttributeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_attribute const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6840,7 +6840,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6854,7 +6854,7 @@ CORBA_OperationDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_operation const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6869,14 +6869,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6884,7 +6884,7 @@ CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6892,7 +6892,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6901,7 +6901,7 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6911,7 +6911,7 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6922,7 +6922,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6931,7 +6931,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describ CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6941,7 +6941,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describ limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6950,7 +6950,7 @@ CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6960,7 +6960,7 @@ CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6971,7 +6971,7 @@ CORBA_ConstantDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6983,7 +6983,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6993,7 +6993,7 @@ CORBA_StructDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7004,7 +7004,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7015,7 +7015,7 @@ CORBA_UnionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7027,7 +7027,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7037,7 +7037,7 @@ CORBA_EnumDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7048,7 +7048,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7058,7 +7058,7 @@ CORBA_AliasDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7069,7 +7069,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7079,7 +7079,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7090,7 +7090,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7106,7 +7106,7 @@ CORBA_ValueDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7123,7 +7123,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7133,7 +7133,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7144,7 +7144,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7154,7 +7154,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_exception const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7165,7 +7165,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7174,7 +7174,7 @@ CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7184,7 +7184,7 @@ CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7194,7 +7194,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_abs const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7205,7 +7205,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7215,7 +7215,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_local_ const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7226,27 +7226,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AbstractInterfaceDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7254,27 +7254,27 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AbstractInterfaceDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7282,27 +7282,27 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AbstractInterfaceDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7310,59 +7310,59 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_AbstractInterfaceDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_AbstractInterfaceDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -7371,7 +7371,7 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7381,46 +7381,46 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_AbstractInterfaceDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_AbstractInterfaceDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -7493,31 +7493,31 @@ POA_CORBA_LocalInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_LocalInterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_LocalInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_LocalInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_LocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_InterfaceDefSeq * POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7525,14 +7525,14 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie<T>::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7540,20 +7540,20 @@ CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie<T>::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_LocalInterfaceDef_tie<T>::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -7564,7 +7564,7 @@ CORBA_AttributeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7576,7 +7576,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7590,7 +7590,7 @@ CORBA_OperationDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7605,14 +7605,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7620,7 +7620,7 @@ CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7628,7 +7628,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7637,7 +7637,7 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7647,7 +7647,7 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7658,7 +7658,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7667,7 +7667,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_c CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7677,7 +7677,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_c limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7686,7 +7686,7 @@ CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7696,7 +7696,7 @@ CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7707,7 +7707,7 @@ CORBA_ConstantDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7719,7 +7719,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7729,7 +7729,7 @@ CORBA_StructDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7740,7 +7740,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7751,7 +7751,7 @@ CORBA_UnionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7763,7 +7763,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7773,7 +7773,7 @@ CORBA_EnumDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7784,7 +7784,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7794,7 +7794,7 @@ CORBA_AliasDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7805,7 +7805,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7815,7 +7815,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7826,7 +7826,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7842,7 +7842,7 @@ CORBA_ValueDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7859,7 +7859,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7869,7 +7869,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7880,7 +7880,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7890,7 +7890,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7901,7 +7901,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7910,7 +7910,7 @@ CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7920,7 +7920,7 @@ CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7930,7 +7930,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_abstra const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7941,7 +7941,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7951,7 +7951,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_local_int const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7962,27 +7962,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_LocalInterfaceDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7990,27 +7990,27 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_LocalInterfaceDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8018,27 +8018,27 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_LocalInterfaceDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8046,59 +8046,59 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_LocalInterfaceDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_LocalInterfaceDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_LocalInterfaceDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_LocalInterfaceDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -8107,7 +8107,7 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8117,46 +8117,46 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_LocalInterfaceDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_LocalInterfaceDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_LocalInterfaceDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp index 929682e2d11..7cea15e7880 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp @@ -216,31 +216,31 @@ public: const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ComponentDef_ptr result); @@ -268,7 +268,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -280,12 +280,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -313,25 +313,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -343,7 +343,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_S char * TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -353,10 +353,10 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -379,31 +379,31 @@ public: IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::HomeDef_ptr result); @@ -433,7 +433,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_ IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -446,12 +446,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -482,25 +482,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SIN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -512,7 +512,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE char * TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -522,10 +522,10 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_in CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -565,17 +565,17 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentReposi IR::_TAO_ComponentRepository_Proxy_Impl& POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy ( ::IR::ComponentRepository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -585,7 +585,7 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -660,7 +660,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -676,7 +676,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create _collocated_tao_target_->_object_key (), "create_component", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -690,7 +690,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create version, base_component, supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -702,7 +702,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -718,7 +718,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home _collocated_tao_target_->_object_key (), "create_home", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -733,7 +733,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home base_home, managed_component, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -764,7 +764,7 @@ void POA_IR::ComponentRepository::create_component_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -805,12 +805,12 @@ void POA_IR::ComponentRepository::create_component_skel ( version.in (), base_component.in (), supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -821,7 +821,7 @@ void POA_IR::ComponentRepository::create_component_skel ( version.in (), base_component.in (), supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -830,7 +830,7 @@ void POA_IR::ComponentRepository::create_component_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -838,12 +838,12 @@ void POA_IR::ComponentRepository::create_component_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -871,7 +871,7 @@ void POA_IR::ComponentRepository::create_home_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -915,12 +915,12 @@ void POA_IR::ComponentRepository::create_home_skel ( base_home.in (), managed_component.in (), primary_key.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -932,7 +932,7 @@ void POA_IR::ComponentRepository::create_home_skel ( base_home.in (), managed_component.in (), primary_key.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -941,7 +941,7 @@ void POA_IR::ComponentRepository::create_home_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -949,12 +949,12 @@ void POA_IR::ComponentRepository::create_home_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -982,7 +982,7 @@ void POA_IR::ComponentRepository::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -992,7 +992,7 @@ void POA_IR::ComponentRepository::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1005,11 +1005,11 @@ void POA_IR::ComponentRepository::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1022,7 +1022,7 @@ void POA_IR::ComponentRepository::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference; @@ -1041,7 +1041,7 @@ void POA_IR::ComponentRepository::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1068,10 +1068,10 @@ void POA_IR::ComponentRepository::_interface_skel ( CORBA::Boolean POA_IR::ComponentRepository::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1102,12 +1102,12 @@ void* POA_IR::ComponentRepository::_downcast ( return 0; } -void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -1117,9 +1117,9 @@ const char* POA_IR::ComponentRepository::_interface_repository_id (void) const } IR::ComponentRepository* -POA_IR::ComponentRepository::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ComponentRepository::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1286,31 +1286,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ProvidesDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDef_ptr result); @@ -1328,44 +1328,44 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_I TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ProvidesDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1377,7 +1377,7 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1387,10 +1387,10 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1430,17 +1430,17 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized IR::_TAO_ProvidesDef_Proxy_Impl& POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy ( ::IR::ProvidesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -1450,7 +1450,7 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -1520,7 +1520,7 @@ POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1536,7 +1536,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty _collocated_tao_target_->_object_key (), "interface_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -1545,7 +1545,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty "IDL:omg.org/IR/ProvidesDef:1.0" ) )->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1575,7 +1575,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ProvidesDef *_tao_impl = @@ -1596,18 +1596,18 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1616,7 +1616,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1624,12 +1624,12 @@ void POA_IR::ProvidesDef::_get_interface_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1657,7 +1657,7 @@ void POA_IR::ProvidesDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1667,7 +1667,7 @@ void POA_IR::ProvidesDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1680,11 +1680,11 @@ void POA_IR::ProvidesDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1697,7 +1697,7 @@ void POA_IR::ProvidesDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference; @@ -1716,7 +1716,7 @@ void POA_IR::ProvidesDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1743,10 +1743,10 @@ void POA_IR::ProvidesDef::_interface_skel ( CORBA::Boolean POA_IR::ProvidesDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1774,12 +1774,12 @@ void* POA_IR::ProvidesDef::_downcast ( return 0; } -void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -1789,9 +1789,9 @@ const char* POA_IR::ProvidesDef::_interface_repository_id (void) const } IR::ProvidesDef* -POA_IR::ProvidesDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1959,31 +1959,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDef_ptr result); @@ -2001,44 +2001,44 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_Us TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::UsesDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2050,7 +2050,7 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2060,10 +2060,10 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2080,31 +2080,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -2122,44 +2122,44 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_IR_UsesD TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::UsesDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2171,7 +2171,7 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2181,10 +2181,10 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2224,17 +2224,17 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_B IR::_TAO_UsesDef_Proxy_Impl& POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy ( ::IR::UsesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2244,7 +2244,7 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2314,7 +2314,7 @@ POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void) CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2330,7 +2330,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type ( _collocated_tao_target_->_object_key (), "interface_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2339,13 +2339,13 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type ( "IDL:omg.org/IR/UsesDef:1.0" ) )->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2361,7 +2361,7 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple ( _collocated_tao_target_->_object_key (), "is_multiple", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -2370,7 +2370,7 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple ( "IDL:omg.org/IR/UsesDef:1.0" ) )->is_multiple ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2400,7 +2400,7 @@ void POA_IR::UsesDef::_get_interface_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::UsesDef *_tao_impl = @@ -2421,18 +2421,18 @@ void POA_IR::UsesDef::_get_interface_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2441,7 +2441,7 @@ void POA_IR::UsesDef::_get_interface_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2449,12 +2449,12 @@ void POA_IR::UsesDef::_get_interface_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2482,7 +2482,7 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::UsesDef *_tao_impl = @@ -2503,18 +2503,18 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_multiple ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2522,7 +2522,7 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2530,12 +2530,12 @@ void POA_IR::UsesDef::_get_is_multiple_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2563,7 +2563,7 @@ void POA_IR::UsesDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2573,7 +2573,7 @@ void POA_IR::UsesDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2586,11 +2586,11 @@ void POA_IR::UsesDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2603,7 +2603,7 @@ void POA_IR::UsesDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference; @@ -2622,7 +2622,7 @@ void POA_IR::UsesDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -2649,10 +2649,10 @@ void POA_IR::UsesDef::_interface_skel ( CORBA::Boolean POA_IR::UsesDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -2680,12 +2680,12 @@ void* POA_IR::UsesDef::_downcast ( return 0; } -void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -2695,9 +2695,9 @@ const char* POA_IR::UsesDef::_interface_repository_id (void) const } IR::UsesDef* -POA_IR::UsesDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -2866,31 +2866,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl , const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -2910,7 +2910,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a ( TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::EventDef *tao_impl, const char * event_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2918,12 +2918,12 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a ( {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2939,25 +2939,25 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2969,7 +2969,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2979,10 +2979,10 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2999,31 +2999,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef_ptr result); @@ -3041,44 +3041,44 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::TAO_ServerRequestInfo_IR_EventDef_e TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::EventDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_EventDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3090,7 +3090,7 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3100,10 +3100,10 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3143,17 +3143,17 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy IR::_TAO_EventDef_Proxy_Impl& POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy ( ::IR::EventDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -3163,7 +3163,7 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -3234,7 +3234,7 @@ POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3250,7 +3250,7 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a ( _collocated_tao_target_->_object_key (), "is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -3260,13 +3260,13 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a ( ) )->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3282,7 +3282,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event ( _collocated_tao_target_->_object_key (), "event", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -3291,7 +3291,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event ( "IDL:omg.org/IR/EventDef:1.0" ) )->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3321,7 +3321,7 @@ void POA_IR::EventDef::is_a_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3350,19 +3350,19 @@ void POA_IR::EventDef::is_a_skel ( _tao_upcall, _tao_impl, event_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_a ( event_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3370,7 +3370,7 @@ void POA_IR::EventDef::is_a_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3378,12 +3378,12 @@ void POA_IR::EventDef::is_a_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3411,7 +3411,7 @@ void POA_IR::EventDef::_get_event_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef *_tao_impl = @@ -3432,18 +3432,18 @@ void POA_IR::EventDef::_get_event_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3452,7 +3452,7 @@ void POA_IR::EventDef::_get_event_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3460,12 +3460,12 @@ void POA_IR::EventDef::_get_event_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -3493,7 +3493,7 @@ void POA_IR::EventDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3503,7 +3503,7 @@ void POA_IR::EventDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3516,11 +3516,11 @@ void POA_IR::EventDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3533,7 +3533,7 @@ void POA_IR::EventDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference; @@ -3552,7 +3552,7 @@ void POA_IR::EventDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -3579,10 +3579,10 @@ void POA_IR::EventDef::_interface_skel ( CORBA::Boolean POA_IR::EventDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -3610,12 +3610,12 @@ void* POA_IR::EventDef::_downcast ( return 0; } -void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3625,9 +3625,9 @@ const char* POA_IR::EventDef::_interface_repository_id (void) const } IR::EventDef* -POA_IR::EventDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -3818,17 +3818,17 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy IR::_TAO_EmitsDef_Proxy_Impl& POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy ( ::IR::EmitsDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -3838,7 +3838,7 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -3933,7 +3933,7 @@ void POA_IR::EmitsDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -3943,7 +3943,7 @@ void POA_IR::EmitsDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3956,11 +3956,11 @@ void POA_IR::EmitsDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3973,7 +3973,7 @@ void POA_IR::EmitsDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference; @@ -3992,7 +3992,7 @@ void POA_IR::EmitsDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4019,10 +4019,10 @@ void POA_IR::EmitsDef::_interface_skel ( CORBA::Boolean POA_IR::EmitsDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4053,12 +4053,12 @@ void* POA_IR::EmitsDef::_downcast ( return 0; } -void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4068,9 +4068,9 @@ const char* POA_IR::EmitsDef::_interface_repository_id (void) const } IR::EmitsDef* -POA_IR::EmitsDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -4261,17 +4261,17 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategiz IR::_TAO_PublishesDef_Proxy_Impl& POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy ( ::IR::PublishesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -4281,7 +4281,7 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -4376,7 +4376,7 @@ void POA_IR::PublishesDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4386,7 +4386,7 @@ void POA_IR::PublishesDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4399,11 +4399,11 @@ void POA_IR::PublishesDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4416,7 +4416,7 @@ void POA_IR::PublishesDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference; @@ -4435,7 +4435,7 @@ void POA_IR::PublishesDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4462,10 +4462,10 @@ void POA_IR::PublishesDef::_interface_skel ( CORBA::Boolean POA_IR::PublishesDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4496,12 +4496,12 @@ void* POA_IR::PublishesDef::_downcast ( return 0; } -void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4511,9 +4511,9 @@ const char* POA_IR::PublishesDef::_interface_repository_id (void) const } IR::PublishesDef* -POA_IR::PublishesDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -4704,17 +4704,17 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized IR::_TAO_ConsumesDef_Proxy_Impl& POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy ( ::IR::ConsumesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -4724,7 +4724,7 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -4819,7 +4819,7 @@ void POA_IR::ConsumesDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -4829,7 +4829,7 @@ void POA_IR::ConsumesDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4842,11 +4842,11 @@ void POA_IR::ConsumesDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -4859,7 +4859,7 @@ void POA_IR::ConsumesDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference; @@ -4878,7 +4878,7 @@ void POA_IR::ConsumesDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -4905,10 +4905,10 @@ void POA_IR::ConsumesDef::_interface_skel ( CORBA::Boolean POA_IR::ConsumesDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -4939,12 +4939,12 @@ void* POA_IR::ConsumesDef::_downcast ( return 0; } -void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -4954,9 +4954,9 @@ const char* POA_IR::ConsumesDef::_interface_repository_id (void) const } IR::ConsumesDef* -POA_IR::ConsumesDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -5165,31 +5165,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDefSeq * result); @@ -5207,44 +5207,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerReques TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5256,7 +5256,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_ char * TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5266,10 +5266,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_deri CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5287,31 +5287,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl , const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5330,7 +5330,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5338,12 +5338,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5359,25 +5359,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_E } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -5385,7 +5385,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_ char * TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5395,10 +5395,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_deri CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo @@ -5408,31 +5408,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ComponentDef_ptr result); @@ -5450,44 +5450,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::TAO_ServerRequestInfo_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5499,7 +5499,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE char * TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5509,10 +5509,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_in CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5529,31 +5529,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ProvidesDefSeq * result); @@ -5571,44 +5571,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ServerRequest TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5620,7 +5620,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_S char * TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5630,10 +5630,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5650,31 +5650,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::UsesDefSeq * result); @@ -5692,44 +5692,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ServerRequestInfo TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5741,7 +5741,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5751,10 +5751,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5771,31 +5771,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::EmitsDefSeq * result); @@ -5813,44 +5813,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::TAO_ServerRequestInfo_IR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5862,7 +5862,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5872,10 +5872,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5892,31 +5892,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::PublishesDefSeq * result); @@ -5934,44 +5934,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ServerRequestInf TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5983,7 +5983,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SING char * TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5993,10 +5993,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_ CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6013,31 +6013,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ConsumesDefSeq * result); @@ -6055,44 +6055,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ServerRequestInfo TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6104,7 +6104,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGL char * TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6114,10 +6114,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_i CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6134,31 +6134,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -6176,44 +6176,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::TAO_ServerRequestInfo_IR_Com TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::ComponentDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6225,7 +6225,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6235,10 +6235,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6259,31 +6259,31 @@ public: const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ProvidesDef_ptr result); @@ -6309,7 +6309,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_ const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6320,12 +6320,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6350,25 +6350,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6380,7 +6380,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6390,10 +6390,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6415,31 +6415,31 @@ public: const char * version, CORBA_InterfaceDef_ptr interface_type, const CORBA::Boolean & is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::UsesDef_ptr result); @@ -6467,7 +6467,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp const char * version, CORBA_InterfaceDef_ptr interface_type, const CORBA::Boolean & is_multiple - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6479,12 +6479,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6512,25 +6512,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6542,7 +6542,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DE char * TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6552,10 +6552,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6576,31 +6576,31 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::EmitsDef_ptr result); @@ -6626,7 +6626,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6637,12 +6637,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6667,25 +6667,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6697,7 +6697,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6707,10 +6707,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6731,31 +6731,31 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::PublishesDef_ptr result); @@ -6781,7 +6781,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6792,12 +6792,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6822,25 +6822,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGL } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -6852,7 +6852,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6862,10 +6862,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -6886,31 +6886,31 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ConsumesDef_ptr result); @@ -6936,7 +6936,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_ const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6947,12 +6947,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -6977,25 +6977,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -7007,7 +7007,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -7017,10 +7017,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -7060,17 +7060,17 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategiz IR::_TAO_ComponentDef_Proxy_Impl& POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy ( ::IR::ComponentDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -7080,7 +7080,7 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -7150,7 +7150,7 @@ POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Im CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7166,7 +7166,7 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_ _collocated_tao_target_->_object_key (), "supported_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7175,14 +7175,14 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_ "IDL:omg.org/IR/ComponentDef:1.0" ) )->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7196,7 +7196,7 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces ( _collocated_tao_target_->_object_key (), "supported_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -7206,14 +7206,14 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces ( ) )->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7229,7 +7229,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen _collocated_tao_target_->_object_key (), "base_component", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7238,13 +7238,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen "IDL:omg.org/IR/ComponentDef:1.0" ) )->base_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7260,7 +7260,7 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte _collocated_tao_target_->_object_key (), "provides_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7269,13 +7269,13 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte "IDL:omg.org/IR/ComponentDef:1.0" ) )->provides_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7291,7 +7291,7 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces ( _collocated_tao_target_->_object_key (), "uses_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7300,13 +7300,13 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces ( "IDL:omg.org/IR/ComponentDef:1.0" ) )->uses_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7322,7 +7322,7 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events ( _collocated_tao_target_->_object_key (), "emits_events", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7331,13 +7331,13 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events ( "IDL:omg.org/IR/ComponentDef:1.0" ) )->emits_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7353,7 +7353,7 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev _collocated_tao_target_->_object_key (), "publishes_events", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7362,13 +7362,13 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev "IDL:omg.org/IR/ComponentDef:1.0" ) )->publishes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7384,7 +7384,7 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even _collocated_tao_target_->_object_key (), "consumes_events", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7393,13 +7393,13 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even "IDL:omg.org/IR/ComponentDef:1.0" ) )->consumes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7415,7 +7415,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic ( _collocated_tao_target_->_object_key (), "is_basic", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -7424,7 +7424,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic ( "IDL:omg.org/IR/ComponentDef:1.0" ) )->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -7434,7 +7434,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7450,7 +7450,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide _collocated_tao_target_->_object_key (), "create_provides", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7463,7 +7463,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide name, version, interface_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7474,7 +7474,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses ( const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7490,7 +7490,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses ( _collocated_tao_target_->_object_key (), "create_uses", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7504,7 +7504,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses ( version, interface_type, is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7514,7 +7514,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7530,7 +7530,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits ( _collocated_tao_target_->_object_key (), "create_emits", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7543,7 +7543,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits ( name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7553,7 +7553,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7569,7 +7569,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis _collocated_tao_target_->_object_key (), "create_publishes", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7582,7 +7582,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7592,7 +7592,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7608,7 +7608,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume _collocated_tao_target_->_object_key (), "create_consumes", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7621,7 +7621,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -7654,7 +7654,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -7675,18 +7675,18 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7695,7 +7695,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7703,12 +7703,12 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7736,7 +7736,7 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7765,25 +7765,25 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( _tao_upcall, _tao_impl, supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7791,12 +7791,12 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7817,7 +7817,7 @@ void POA_IR::ComponentDef::_get_base_component_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -7838,18 +7838,18 @@ void POA_IR::ComponentDef::_get_base_component_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->base_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7858,7 +7858,7 @@ void POA_IR::ComponentDef::_get_base_component_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7866,12 +7866,12 @@ void POA_IR::ComponentDef::_get_base_component_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7899,7 +7899,7 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -7920,18 +7920,18 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->provides_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7940,7 +7940,7 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7948,12 +7948,12 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7981,7 +7981,7 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8002,18 +8002,18 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->uses_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8022,7 +8022,7 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8030,12 +8030,12 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8063,7 +8063,7 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8084,18 +8084,18 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->emits_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8104,7 +8104,7 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8112,12 +8112,12 @@ void POA_IR::ComponentDef::_get_emits_events_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8145,7 +8145,7 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8166,18 +8166,18 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->publishes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8186,7 +8186,7 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8194,12 +8194,12 @@ void POA_IR::ComponentDef::_get_publishes_events_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8227,7 +8227,7 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8248,18 +8248,18 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->consumes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8268,7 +8268,7 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8276,12 +8276,12 @@ void POA_IR::ComponentDef::_get_consumes_events_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8309,7 +8309,7 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = @@ -8330,18 +8330,18 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8349,7 +8349,7 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8357,12 +8357,12 @@ void POA_IR::ComponentDef::_get_is_basic_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8390,7 +8390,7 @@ void POA_IR::ComponentDef::create_provides_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8428,12 +8428,12 @@ void POA_IR::ComponentDef::create_provides_skel ( name.in (), version.in (), interface_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8443,7 +8443,7 @@ void POA_IR::ComponentDef::create_provides_skel ( name.in (), version.in (), interface_type.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8452,7 +8452,7 @@ void POA_IR::ComponentDef::create_provides_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8460,12 +8460,12 @@ void POA_IR::ComponentDef::create_provides_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8493,7 +8493,7 @@ void POA_IR::ComponentDef::create_uses_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8534,12 +8534,12 @@ void POA_IR::ComponentDef::create_uses_skel ( version.in (), interface_type.in (), is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8550,7 +8550,7 @@ void POA_IR::ComponentDef::create_uses_skel ( version.in (), interface_type.in (), is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8559,7 +8559,7 @@ void POA_IR::ComponentDef::create_uses_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8567,12 +8567,12 @@ void POA_IR::ComponentDef::create_uses_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8600,7 +8600,7 @@ void POA_IR::ComponentDef::create_emits_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8638,12 +8638,12 @@ void POA_IR::ComponentDef::create_emits_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8653,7 +8653,7 @@ void POA_IR::ComponentDef::create_emits_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8662,7 +8662,7 @@ void POA_IR::ComponentDef::create_emits_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8670,12 +8670,12 @@ void POA_IR::ComponentDef::create_emits_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8703,7 +8703,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8741,12 +8741,12 @@ void POA_IR::ComponentDef::create_publishes_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8756,7 +8756,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8765,7 +8765,7 @@ void POA_IR::ComponentDef::create_publishes_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8773,12 +8773,12 @@ void POA_IR::ComponentDef::create_publishes_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8806,7 +8806,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8844,12 +8844,12 @@ void POA_IR::ComponentDef::create_consumes_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8859,7 +8859,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( name.in (), version.in (), value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8868,7 +8868,7 @@ void POA_IR::ComponentDef::create_consumes_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8876,12 +8876,12 @@ void POA_IR::ComponentDef::create_consumes_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8909,7 +8909,7 @@ void POA_IR::ComponentDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8919,7 +8919,7 @@ void POA_IR::ComponentDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8932,11 +8932,11 @@ void POA_IR::ComponentDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8949,7 +8949,7 @@ void POA_IR::ComponentDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference; @@ -8968,7 +8968,7 @@ void POA_IR::ComponentDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -8995,10 +8995,10 @@ void POA_IR::ComponentDef::_interface_skel ( CORBA::Boolean POA_IR::ComponentDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9035,12 +9035,12 @@ void* POA_IR::ComponentDef::_downcast ( return 0; } -void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9050,9 +9050,9 @@ const char* POA_IR::ComponentDef::_interface_repository_id (void) const } IR::ComponentDef* -POA_IR::ComponentDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -9221,31 +9221,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl , const char * primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -9265,7 +9265,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::PrimaryKeyDef *tao_impl, const char * primary_key_id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -9273,12 +9273,12 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -9294,25 +9294,25 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9324,7 +9324,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9334,10 +9334,10 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -9354,31 +9354,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef_ptr result); @@ -9396,44 +9396,44 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ServerRequestInfo_IR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::PrimaryKeyDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -9445,7 +9445,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9455,10 +9455,10 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -9498,17 +9498,17 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strateg IR::_TAO_PrimaryKeyDef_Proxy_Impl& POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy ( ::IR::PrimaryKeyDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -9518,7 +9518,7 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -9589,7 +9589,7 @@ POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::_TAO_PrimaryKeyDef_ThruPOA_Proxy_ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9605,7 +9605,7 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a ( _collocated_tao_target_->_object_key (), "is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -9615,13 +9615,13 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a ( ) )->is_a ( primary_key_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9637,7 +9637,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key ( _collocated_tao_target_->_object_key (), "primary_key", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -9646,7 +9646,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key ( "IDL:omg.org/IR/PrimaryKeyDef:1.0" ) )->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -9676,7 +9676,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9705,19 +9705,19 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( _tao_upcall, _tao_impl, primary_key_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_a ( primary_key_id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9725,7 +9725,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9733,12 +9733,12 @@ void POA_IR::PrimaryKeyDef::is_a_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9766,7 +9766,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PrimaryKeyDef *_tao_impl = @@ -9787,18 +9787,18 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9807,7 +9807,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -9815,12 +9815,12 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9848,7 +9848,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9858,7 +9858,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9871,11 +9871,11 @@ void POA_IR::PrimaryKeyDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9888,7 +9888,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference; @@ -9907,7 +9907,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9934,10 +9934,10 @@ void POA_IR::PrimaryKeyDef::_interface_skel ( CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9965,12 +9965,12 @@ void* POA_IR::PrimaryKeyDef::_downcast ( return 0; } -void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9980,9 +9980,9 @@ const char* POA_IR::PrimaryKeyDef::_interface_repository_id (void) const } IR::PrimaryKeyDef* -POA_IR::PrimaryKeyDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::PrimaryKeyDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -10233,17 +10233,17 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_P IR::_TAO_FactoryDef_Proxy_Impl& POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy ( ::IR::FactoryDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -10253,7 +10253,7 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -10348,7 +10348,7 @@ void POA_IR::FactoryDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10358,7 +10358,7 @@ void POA_IR::FactoryDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10371,11 +10371,11 @@ void POA_IR::FactoryDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10388,7 +10388,7 @@ void POA_IR::FactoryDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference; @@ -10407,7 +10407,7 @@ void POA_IR::FactoryDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -10434,10 +10434,10 @@ void POA_IR::FactoryDef::_interface_skel ( CORBA::Boolean POA_IR::FactoryDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10468,12 +10468,12 @@ void* POA_IR::FactoryDef::_downcast ( return 0; } -void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10483,9 +10483,9 @@ const char* POA_IR::FactoryDef::_interface_repository_id (void) const } IR::FactoryDef* -POA_IR::FactoryDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -10736,17 +10736,17 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Pro IR::_TAO_FinderDef_Proxy_Impl& POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy ( ::IR::FinderDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -10756,7 +10756,7 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -10851,7 +10851,7 @@ void POA_IR::FinderDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -10861,7 +10861,7 @@ void POA_IR::FinderDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10874,11 +10874,11 @@ void POA_IR::FinderDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10891,7 +10891,7 @@ void POA_IR::FinderDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference; @@ -10910,7 +10910,7 @@ void POA_IR::FinderDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -10937,10 +10937,10 @@ void POA_IR::FinderDef::_interface_skel ( CORBA::Boolean POA_IR::FinderDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -10971,12 +10971,12 @@ void* POA_IR::FinderDef::_downcast ( return 0; } -void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -10986,9 +10986,9 @@ const char* POA_IR::FinderDef::_interface_repository_id (void) const } IR::FinderDef* -POA_IR::FinderDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -11191,31 +11191,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::HomeDef_ptr result); @@ -11233,44 +11233,44 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11282,7 +11282,7 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11292,10 +11292,10 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11312,31 +11312,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::ComponentDef_ptr result); @@ -11354,44 +11354,44 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::TAO_ServerRequestInfo_IR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11403,7 +11403,7 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_A char * TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11413,10 +11413,10 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11433,31 +11433,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::PrimaryKeyDef_ptr result); @@ -11475,44 +11475,44 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::TAO_ServerRequestInfo_IR_HomeD TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11524,7 +11524,7 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DEC char * TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11534,10 +11534,10 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11554,31 +11554,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::FactoryDefSeq * result); @@ -11596,44 +11596,44 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::TAO_ServerRequestInfo_IR_HomeDef TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11645,7 +11645,7 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11655,10 +11655,10 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11675,31 +11675,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::FinderDefSeq * result); @@ -11717,44 +11717,44 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::TAO_ServerRequestInfo_IR_HomeDef_f TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11766,7 +11766,7 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11776,10 +11776,10 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11796,31 +11796,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -11838,44 +11838,44 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::TAO_ServerRequestInfo_IR_HomeDef_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_IR::HomeDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -11887,7 +11887,7 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -11897,10 +11897,10 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -11921,31 +11921,31 @@ public: const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::PrimaryKeyDef_ptr result); @@ -11971,7 +11971,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -11982,12 +11982,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12012,25 +12012,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12042,7 +12042,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12052,10 +12052,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12077,31 +12077,31 @@ public: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::FactoryDef_ptr result); @@ -12129,7 +12129,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -12141,12 +12141,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12174,25 +12174,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12204,7 +12204,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12214,10 +12214,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12239,31 +12239,31 @@ public: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (IR::FinderDef_ptr result); @@ -12291,7 +12291,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -12303,12 +12303,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef {} Dynamic::ParameterList * -TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -12336,25 +12336,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -12366,7 +12366,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -12376,10 +12376,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -12419,17 +12419,17 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_B IR::_TAO_HomeDef_Proxy_Impl& POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy ( ::IR::HomeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -12439,7 +12439,7 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy ( void POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -12509,7 +12509,7 @@ POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void) IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12525,7 +12525,7 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home ( _collocated_tao_target_->_object_key (), "base_home", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12534,13 +12534,13 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home ( "IDL:omg.org/IR/HomeDef:1.0" ) )->base_home ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12556,7 +12556,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component _collocated_tao_target_->_object_key (), "managed_component", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12565,13 +12565,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component "IDL:omg.org/IR/HomeDef:1.0" ) )->managed_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12587,7 +12587,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key ( _collocated_tao_target_->_object_key (), "primary_key", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12596,13 +12596,13 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key ( "IDL:omg.org/IR/HomeDef:1.0" ) )->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12618,7 +12618,7 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories ( _collocated_tao_target_->_object_key (), "factories", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12627,13 +12627,13 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories ( "IDL:omg.org/IR/HomeDef:1.0" ) )->factories ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12649,7 +12649,7 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders ( _collocated_tao_target_->_object_key (), "finders", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12658,13 +12658,13 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders ( "IDL:omg.org/IR/HomeDef:1.0" ) )->finders ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12680,7 +12680,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic ( _collocated_tao_target_->_object_key (), "is_basic", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -12689,7 +12689,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic ( "IDL:omg.org/IR/HomeDef:1.0" ) )->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -12699,7 +12699,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12715,7 +12715,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke _collocated_tao_target_->_object_key (), "create_primary_key", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12728,7 +12728,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke name, version, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12739,7 +12739,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12755,7 +12755,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory ( _collocated_tao_target_->_object_key (), "create_factory", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12769,7 +12769,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory ( version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12780,7 +12780,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -12796,7 +12796,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder ( _collocated_tao_target_->_object_key (), "create_finder", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -12810,7 +12810,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder ( version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -12843,7 +12843,7 @@ void POA_IR::HomeDef::_get_base_home_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -12864,18 +12864,18 @@ void POA_IR::HomeDef::_get_base_home_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->base_home ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -12884,7 +12884,7 @@ void POA_IR::HomeDef::_get_base_home_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -12892,12 +12892,12 @@ void POA_IR::HomeDef::_get_base_home_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -12925,7 +12925,7 @@ void POA_IR::HomeDef::_get_managed_component_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -12946,18 +12946,18 @@ void POA_IR::HomeDef::_get_managed_component_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->managed_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -12966,7 +12966,7 @@ void POA_IR::HomeDef::_get_managed_component_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -12974,12 +12974,12 @@ void POA_IR::HomeDef::_get_managed_component_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13007,7 +13007,7 @@ void POA_IR::HomeDef::_get_primary_key_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -13028,18 +13028,18 @@ void POA_IR::HomeDef::_get_primary_key_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13048,7 +13048,7 @@ void POA_IR::HomeDef::_get_primary_key_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13056,12 +13056,12 @@ void POA_IR::HomeDef::_get_primary_key_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13089,7 +13089,7 @@ void POA_IR::HomeDef::_get_factories_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -13110,18 +13110,18 @@ void POA_IR::HomeDef::_get_factories_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->factories ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13130,7 +13130,7 @@ void POA_IR::HomeDef::_get_factories_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13138,12 +13138,12 @@ void POA_IR::HomeDef::_get_factories_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13171,7 +13171,7 @@ void POA_IR::HomeDef::_get_finders_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -13192,18 +13192,18 @@ void POA_IR::HomeDef::_get_finders_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->finders ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13212,7 +13212,7 @@ void POA_IR::HomeDef::_get_finders_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13220,12 +13220,12 @@ void POA_IR::HomeDef::_get_finders_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13253,7 +13253,7 @@ void POA_IR::HomeDef::_get_is_basic_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = @@ -13274,18 +13274,18 @@ void POA_IR::HomeDef::_get_is_basic_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13293,7 +13293,7 @@ void POA_IR::HomeDef::_get_is_basic_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13301,12 +13301,12 @@ void POA_IR::HomeDef::_get_is_basic_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13334,7 +13334,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13372,12 +13372,12 @@ void POA_IR::HomeDef::create_primary_key_skel ( name.in (), version.in (), primary_key.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -13387,7 +13387,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( name.in (), version.in (), primary_key.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13396,7 +13396,7 @@ void POA_IR::HomeDef::create_primary_key_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13404,12 +13404,12 @@ void POA_IR::HomeDef::create_primary_key_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13437,7 +13437,7 @@ void POA_IR::HomeDef::create_factory_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13478,12 +13478,12 @@ void POA_IR::HomeDef::create_factory_skel ( version.in (), params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -13494,7 +13494,7 @@ void POA_IR::HomeDef::create_factory_skel ( version.in (), params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13503,7 +13503,7 @@ void POA_IR::HomeDef::create_factory_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13511,12 +13511,12 @@ void POA_IR::HomeDef::create_factory_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13544,7 +13544,7 @@ void POA_IR::HomeDef::create_finder_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13585,12 +13585,12 @@ void POA_IR::HomeDef::create_finder_skel ( version.in (), params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -13601,7 +13601,7 @@ void POA_IR::HomeDef::create_finder_skel ( version.in (), params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -13610,7 +13610,7 @@ void POA_IR::HomeDef::create_finder_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -13618,12 +13618,12 @@ void POA_IR::HomeDef::create_finder_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -13651,7 +13651,7 @@ void POA_IR::HomeDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -13661,7 +13661,7 @@ void POA_IR::HomeDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -13674,11 +13674,11 @@ void POA_IR::HomeDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -13691,7 +13691,7 @@ void POA_IR::HomeDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference; @@ -13710,7 +13710,7 @@ void POA_IR::HomeDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -13737,10 +13737,10 @@ void POA_IR::HomeDef::_interface_skel ( CORBA::Boolean POA_IR::HomeDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -13777,12 +13777,12 @@ void* POA_IR::HomeDef::_downcast ( return 0; } -void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -13792,9 +13792,9 @@ const char* POA_IR::HomeDef::_interface_repository_id (void) const } IR::HomeDef* -POA_IR::HomeDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h index ce0d7b2a01a..cd49eb534e2 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h @@ -67,7 +67,7 @@ TAO_NAMESPACE POA_IR virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -78,31 +78,31 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::ComponentRepository *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -113,7 +113,7 @@ TAO_NAMESPACE POA_IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -123,7 +123,7 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::HomeDef_ptr create_home ( @@ -133,7 +133,7 @@ TAO_NAMESPACE POA_IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -143,196 +143,196 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void get_canonical_typecode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void get_primitive_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_string_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_wstring_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_sequence_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_array_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_fixed_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -352,7 +352,7 @@ TAO_NAMESPACE POA_IR virtual ::IR::_TAO_ComponentRepository_Proxy_Impl &select_proxy ( ::IR::ComponentRepository *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -361,7 +361,7 @@ TAO_NAMESPACE POA_IR // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -409,7 +409,7 @@ TAO_NAMESPACE POA_IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -423,7 +423,7 @@ TAO_NAMESPACE POA_IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -455,7 +455,7 @@ TAO_NAMESPACE POA_IR virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -466,37 +466,37 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::ProvidesDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -506,98 +506,98 @@ TAO_NAMESPACE POA_IR TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -617,7 +617,7 @@ TAO_NAMESPACE POA_IR virtual ::IR::_TAO_ProvidesDef_Proxy_Impl &select_proxy ( ::IR::ProvidesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -626,7 +626,7 @@ TAO_NAMESPACE POA_IR // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -669,7 +669,7 @@ private: virtual CORBA_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -701,7 +701,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -712,37 +712,37 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::UsesDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -752,11 +752,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_multiple ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -766,98 +766,98 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -877,7 +877,7 @@ private: virtual ::IR::_TAO_UsesDef_Proxy_Impl &select_proxy ( ::IR::UsesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -886,7 +886,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -929,7 +929,7 @@ private: virtual CORBA_InterfaceDef_ptr interface_type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -937,7 +937,7 @@ private: virtual CORBA::Boolean is_multiple ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -969,7 +969,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -980,38 +980,38 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::EventDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1021,11 +1021,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1035,98 +1035,98 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1146,7 +1146,7 @@ private: virtual ::IR::_TAO_EventDef_Proxy_Impl &select_proxy ( ::IR::EventDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1155,7 +1155,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1199,7 +1199,7 @@ private: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1207,7 +1207,7 @@ private: virtual CORBA_ValueDef_ptr event ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1239,7 +1239,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1250,31 +1250,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::EmitsDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -1283,105 +1283,105 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1401,7 +1401,7 @@ private: virtual ::IR::_TAO_EmitsDef_Proxy_Impl &select_proxy ( ::IR::EmitsDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1410,7 +1410,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1477,7 +1477,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1488,31 +1488,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::PublishesDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -1521,105 +1521,105 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1639,7 +1639,7 @@ private: virtual ::IR::_TAO_PublishesDef_Proxy_Impl &select_proxy ( ::IR::PublishesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1648,7 +1648,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1715,7 +1715,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1726,31 +1726,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::ConsumesDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -1759,105 +1759,105 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1877,7 +1877,7 @@ private: virtual ::IR::_TAO_ConsumesDef_Proxy_Impl &select_proxy ( ::IR::ConsumesDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1886,7 +1886,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1953,7 +1953,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1964,37 +1964,37 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::ComponentDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2004,12 +2004,12 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2019,11 +2019,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ComponentDef_ptr base_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2033,11 +2033,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ProvidesDefSeq * provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2047,11 +2047,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::UsesDefSeq * uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2061,11 +2061,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::EmitsDefSeq * emits_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2075,11 +2075,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::PublishesDefSeq * publishes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2089,11 +2089,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ConsumesDefSeq * consumes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2103,11 +2103,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2117,7 +2117,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ProvidesDef_ptr create_provides ( @@ -2125,7 +2125,7 @@ private: const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2135,7 +2135,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::UsesDef_ptr create_uses ( @@ -2144,7 +2144,7 @@ private: const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2154,7 +2154,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::EmitsDef_ptr create_emits ( @@ -2162,7 +2162,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2172,7 +2172,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::PublishesDef_ptr create_publishes ( @@ -2180,7 +2180,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2190,7 +2190,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ConsumesDef_ptr create_consumes ( @@ -2198,7 +2198,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2208,266 +2208,266 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2487,7 +2487,7 @@ private: virtual ::IR::_TAO_ComponentDef_Proxy_Impl &select_proxy ( ::IR::ComponentDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2496,7 +2496,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2539,7 +2539,7 @@ private: virtual CORBA_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2548,7 +2548,7 @@ private: virtual void supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2556,7 +2556,7 @@ private: virtual IR::ComponentDef_ptr base_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2564,7 +2564,7 @@ private: virtual IR::ProvidesDefSeq * provides_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2572,7 +2572,7 @@ private: virtual IR::UsesDefSeq * uses_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2580,7 +2580,7 @@ private: virtual IR::EmitsDefSeq * emits_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2588,7 +2588,7 @@ private: virtual IR::PublishesDefSeq * publishes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2596,7 +2596,7 @@ private: virtual IR::ConsumesDefSeq * consumes_events ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2604,7 +2604,7 @@ private: virtual CORBA::Boolean is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2616,7 +2616,7 @@ private: const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2629,7 +2629,7 @@ private: const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2641,7 +2641,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2653,7 +2653,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2665,7 +2665,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2697,7 +2697,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2708,38 +2708,38 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::PrimaryKeyDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean is_a ( const char * primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2749,11 +2749,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2763,98 +2763,98 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -2874,7 +2874,7 @@ private: virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl &select_proxy ( ::IR::PrimaryKeyDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2883,7 +2883,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -2927,7 +2927,7 @@ private: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2935,7 +2935,7 @@ private: virtual CORBA_ValueDef_ptr primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2967,7 +2967,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -2978,31 +2978,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::FactoryDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -3011,168 +3011,168 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3192,7 +3192,7 @@ private: virtual ::IR::_TAO_FactoryDef_Proxy_Impl &select_proxy ( ::IR::FactoryDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3201,7 +3201,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3268,7 +3268,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3279,31 +3279,31 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::FinderDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -3312,168 +3312,168 @@ private: TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -3493,7 +3493,7 @@ private: virtual ::IR::_TAO_FinderDef_Proxy_Impl &select_proxy ( ::IR::FinderDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3502,7 +3502,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -3569,7 +3569,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -3580,37 +3580,37 @@ private: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::IR::HomeDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual IR::HomeDef_ptr base_home ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3620,11 +3620,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::ComponentDef_ptr managed_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3634,11 +3634,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::PrimaryKeyDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3648,11 +3648,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::FactoryDefSeq * factories ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3662,11 +3662,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::FinderDefSeq * finders ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3676,11 +3676,11 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3690,7 +3690,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::PrimaryKeyDef_ptr create_primary_key ( @@ -3698,7 +3698,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3708,7 +3708,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::FactoryDef_ptr create_factory ( @@ -3717,7 +3717,7 @@ private: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3727,7 +3727,7 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual IR::FinderDef_ptr create_finder ( @@ -3736,7 +3736,7 @@ private: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -3746,266 +3746,266 @@ private: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -4025,7 +4025,7 @@ private: virtual ::IR::_TAO_HomeDef_Proxy_Impl &select_proxy ( ::IR::HomeDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4034,7 +4034,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -4077,7 +4077,7 @@ private: virtual IR::HomeDef_ptr base_home ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4085,7 +4085,7 @@ private: virtual IR::ComponentDef_ptr managed_component ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4093,7 +4093,7 @@ private: virtual IR::PrimaryKeyDef_ptr primary_key ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4101,7 +4101,7 @@ private: virtual IR::FactoryDefSeq * factories ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4109,7 +4109,7 @@ private: virtual IR::FinderDefSeq * finders ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4117,7 +4117,7 @@ private: virtual CORBA::Boolean is_basic ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4129,7 +4129,7 @@ private: const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4142,7 +4142,7 @@ private: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4155,7 +4155,7 @@ private: const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i index 96f3fd02407..8a5a82037d4 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -61,14 +61,14 @@ ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_string_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -76,14 +76,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_string_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -91,14 +91,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -106,14 +106,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_array_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -121,14 +121,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_array_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -136,14 +136,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel ( req, (POA_CORBA_Repository_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -151,14 +151,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -166,14 +166,14 @@ ACE_INLINE void POA_IR::ComponentRepository::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -181,14 +181,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -196,14 +196,14 @@ ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -211,14 +211,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -226,14 +226,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -241,14 +241,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -256,14 +256,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -271,14 +271,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -286,14 +286,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -301,14 +301,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -316,14 +316,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -331,14 +331,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -346,14 +346,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -361,14 +361,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -376,14 +376,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -391,14 +391,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -406,14 +406,14 @@ ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentRepository::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj; @@ -421,14 +421,14 @@ ACE_INLINE void POA_IR::ComponentRepository::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -436,14 +436,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -451,14 +451,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -466,14 +466,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -481,14 +481,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -496,14 +496,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -511,14 +511,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -526,14 +526,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -541,14 +541,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -556,14 +556,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -571,14 +571,14 @@ ACE_INLINE void POA_IR::ProvidesDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -586,14 +586,14 @@ ACE_INLINE void POA_IR::ProvidesDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -601,14 +601,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ProvidesDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj; @@ -616,14 +616,14 @@ ACE_INLINE void POA_IR::ProvidesDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -631,14 +631,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -646,14 +646,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -661,14 +661,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -676,14 +676,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -691,14 +691,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -706,14 +706,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -721,14 +721,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -736,14 +736,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -751,14 +751,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -766,14 +766,14 @@ ACE_INLINE void POA_IR::UsesDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -781,14 +781,14 @@ ACE_INLINE void POA_IR::UsesDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -796,14 +796,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::UsesDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj; @@ -811,14 +811,14 @@ ACE_INLINE void POA_IR::UsesDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -826,14 +826,14 @@ ACE_INLINE void POA_IR::EventDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -841,14 +841,14 @@ ACE_INLINE void POA_IR::EventDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -856,14 +856,14 @@ ACE_INLINE void POA_IR::EventDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -871,14 +871,14 @@ ACE_INLINE void POA_IR::EventDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -886,14 +886,14 @@ ACE_INLINE void POA_IR::EventDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -901,14 +901,14 @@ ACE_INLINE void POA_IR::EventDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -916,14 +916,14 @@ ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -931,14 +931,14 @@ ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -946,14 +946,14 @@ ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -961,14 +961,14 @@ ACE_INLINE void POA_IR::EventDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -976,14 +976,14 @@ ACE_INLINE void POA_IR::EventDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -991,14 +991,14 @@ ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EventDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj; @@ -1006,14 +1006,14 @@ ACE_INLINE void POA_IR::EventDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1021,14 +1021,14 @@ ACE_INLINE void POA_IR::EmitsDef::is_a_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1036,14 +1036,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_event_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1051,14 +1051,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1066,14 +1066,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1081,14 +1081,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1096,14 +1096,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1111,14 +1111,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1126,14 +1126,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1141,14 +1141,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1156,14 +1156,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1171,14 +1171,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1186,14 +1186,14 @@ ACE_INLINE void POA_IR::EmitsDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1201,14 +1201,14 @@ ACE_INLINE void POA_IR::EmitsDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1216,14 +1216,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::EmitsDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj; @@ -1231,14 +1231,14 @@ ACE_INLINE void POA_IR::EmitsDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1246,14 +1246,14 @@ ACE_INLINE void POA_IR::PublishesDef::is_a_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1261,14 +1261,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_event_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1276,14 +1276,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1291,14 +1291,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1306,14 +1306,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1321,14 +1321,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1336,14 +1336,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1351,14 +1351,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1366,14 +1366,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1381,14 +1381,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1396,14 +1396,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1411,14 +1411,14 @@ ACE_INLINE void POA_IR::PublishesDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1426,14 +1426,14 @@ ACE_INLINE void POA_IR::PublishesDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1441,14 +1441,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PublishesDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj; @@ -1456,14 +1456,14 @@ ACE_INLINE void POA_IR::PublishesDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1471,14 +1471,14 @@ ACE_INLINE void POA_IR::ConsumesDef::is_a_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1486,14 +1486,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel ( req, (POA_IR::EventDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1501,14 +1501,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1516,14 +1516,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1531,14 +1531,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1546,14 +1546,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1561,14 +1561,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1576,14 +1576,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1591,14 +1591,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1606,14 +1606,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1621,14 +1621,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1636,14 +1636,14 @@ ACE_INLINE void POA_IR::ConsumesDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1651,14 +1651,14 @@ ACE_INLINE void POA_IR::ConsumesDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1666,14 +1666,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ConsumesDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj; @@ -1681,14 +1681,14 @@ ACE_INLINE void POA_IR::ConsumesDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1696,14 +1696,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1711,14 +1711,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1726,14 +1726,14 @@ ACE_INLINE void POA_IR::ComponentDef::is_a_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1741,14 +1741,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1756,14 +1756,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1771,14 +1771,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_operation_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1786,14 +1786,14 @@ ACE_INLINE void POA_IR::ComponentDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1801,14 +1801,14 @@ ACE_INLINE void POA_IR::ComponentDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1816,14 +1816,14 @@ ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1831,14 +1831,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1846,14 +1846,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1861,14 +1861,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1876,14 +1876,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1891,14 +1891,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1906,14 +1906,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1921,14 +1921,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1936,14 +1936,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1951,14 +1951,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1966,14 +1966,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1981,14 +1981,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -1996,14 +1996,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2011,14 +2011,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2026,14 +2026,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2041,14 +2041,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2056,14 +2056,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2071,14 +2071,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2086,14 +2086,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2101,14 +2101,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2116,14 +2116,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2131,14 +2131,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2146,14 +2146,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2161,14 +2161,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2176,14 +2176,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2191,14 +2191,14 @@ ACE_INLINE void POA_IR::ComponentDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2206,14 +2206,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2221,14 +2221,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::ComponentDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj; @@ -2236,14 +2236,14 @@ ACE_INLINE void POA_IR::ComponentDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2251,14 +2251,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2266,14 +2266,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2281,14 +2281,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2296,14 +2296,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2311,14 +2311,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2326,14 +2326,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2341,14 +2341,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2356,14 +2356,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2371,14 +2371,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2386,14 +2386,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2401,14 +2401,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2416,14 +2416,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj; @@ -2431,14 +2431,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_result_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2446,14 +2446,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_result_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2461,14 +2461,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2476,14 +2476,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2491,14 +2491,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_params_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2506,14 +2506,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_params_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2521,14 +2521,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2536,14 +2536,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2551,14 +2551,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2566,14 +2566,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2581,14 +2581,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2596,14 +2596,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2611,14 +2611,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2626,14 +2626,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2641,14 +2641,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2656,14 +2656,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2671,14 +2671,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2686,14 +2686,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2701,14 +2701,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2716,14 +2716,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2731,14 +2731,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2746,14 +2746,14 @@ ACE_INLINE void POA_IR::FactoryDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2761,14 +2761,14 @@ ACE_INLINE void POA_IR::FactoryDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2776,14 +2776,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FactoryDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj; @@ -2791,14 +2791,14 @@ ACE_INLINE void POA_IR::FactoryDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_result_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2806,14 +2806,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_result_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2821,14 +2821,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2836,14 +2836,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2851,14 +2851,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_params_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_params_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2866,14 +2866,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_params_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2881,14 +2881,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_mode_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_mode_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2896,14 +2896,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_mode_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2911,14 +2911,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2926,14 +2926,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2941,14 +2941,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2956,14 +2956,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel ( req, (POA_CORBA_OperationDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2971,14 +2971,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -2986,14 +2986,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3001,14 +3001,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3016,14 +3016,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3031,14 +3031,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3046,14 +3046,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3061,14 +3061,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3076,14 +3076,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3091,14 +3091,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3106,14 +3106,14 @@ ACE_INLINE void POA_IR::FinderDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3121,14 +3121,14 @@ ACE_INLINE void POA_IR::FinderDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3136,14 +3136,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::FinderDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj; @@ -3151,14 +3151,14 @@ ACE_INLINE void POA_IR::FinderDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3166,14 +3166,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3181,14 +3181,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::is_a_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3196,14 +3196,14 @@ ACE_INLINE void POA_IR::HomeDef::is_a_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::describe_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3211,14 +3211,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_interface_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_attribute_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3226,14 +3226,14 @@ ACE_INLINE void POA_IR::HomeDef::create_attribute_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_operation_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3241,14 +3241,14 @@ ACE_INLINE void POA_IR::HomeDef::create_operation_skel ( req, (POA_CORBA_InterfaceDef_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3256,14 +3256,14 @@ ACE_INLINE void POA_IR::HomeDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3271,14 +3271,14 @@ ACE_INLINE void POA_IR::HomeDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3286,14 +3286,14 @@ ACE_INLINE void POA_IR::HomeDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3301,14 +3301,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3316,14 +3316,14 @@ ACE_INLINE void POA_IR::HomeDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3331,14 +3331,14 @@ ACE_INLINE void POA_IR::HomeDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3346,14 +3346,14 @@ ACE_INLINE void POA_IR::HomeDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3361,14 +3361,14 @@ ACE_INLINE void POA_IR::HomeDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3376,14 +3376,14 @@ ACE_INLINE void POA_IR::HomeDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3391,14 +3391,14 @@ ACE_INLINE void POA_IR::HomeDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3406,14 +3406,14 @@ ACE_INLINE void POA_IR::HomeDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3421,14 +3421,14 @@ ACE_INLINE void POA_IR::HomeDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3436,14 +3436,14 @@ ACE_INLINE void POA_IR::HomeDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3451,14 +3451,14 @@ ACE_INLINE void POA_IR::HomeDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3466,14 +3466,14 @@ ACE_INLINE void POA_IR::HomeDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3481,14 +3481,14 @@ ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3496,14 +3496,14 @@ ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3511,14 +3511,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3526,14 +3526,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3541,14 +3541,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3556,14 +3556,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3571,14 +3571,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3586,14 +3586,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3601,14 +3601,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3616,14 +3616,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3631,14 +3631,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3646,14 +3646,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3661,14 +3661,14 @@ ACE_INLINE void POA_IR::HomeDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3676,14 +3676,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3691,14 +3691,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_IR::HomeDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj; @@ -3706,6 +3706,6 @@ ACE_INLINE void POA_IR::HomeDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h index 500e9839c58..cc915fc6a37 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h @@ -64,7 +64,7 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); IR::ComponentDef_ptr create_component ( const char * id, @@ -72,7 +72,7 @@ TAO_NAMESPACE POA_IR const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -85,7 +85,7 @@ TAO_NAMESPACE POA_IR IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -93,7 +93,7 @@ TAO_NAMESPACE POA_IR CORBA_Contained_ptr lookup_id ( const char * search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -101,7 +101,7 @@ TAO_NAMESPACE POA_IR CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -109,7 +109,7 @@ TAO_NAMESPACE POA_IR CORBA_PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -117,7 +117,7 @@ TAO_NAMESPACE POA_IR CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -125,7 +125,7 @@ TAO_NAMESPACE POA_IR CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -134,7 +134,7 @@ TAO_NAMESPACE POA_IR CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -143,7 +143,7 @@ TAO_NAMESPACE POA_IR CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -152,7 +152,7 @@ TAO_NAMESPACE POA_IR CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -160,7 +160,7 @@ TAO_NAMESPACE POA_IR CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -169,7 +169,7 @@ TAO_NAMESPACE POA_IR CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -180,7 +180,7 @@ TAO_NAMESPACE POA_IR CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -190,7 +190,7 @@ TAO_NAMESPACE POA_IR CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -200,7 +200,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -212,7 +212,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -223,7 +223,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -235,7 +235,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -246,7 +246,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -257,7 +257,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -268,7 +268,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -285,7 +285,7 @@ TAO_NAMESPACE POA_IR const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -296,7 +296,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -307,7 +307,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -317,7 +317,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -328,7 +328,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -339,21 +339,21 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -399,17 +399,17 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -417,14 +417,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -432,14 +432,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -447,35 +447,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -485,21 +485,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -545,24 +545,24 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_multiple ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -570,14 +570,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -585,14 +585,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -600,35 +600,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -638,21 +638,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -698,25 +698,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -724,14 +724,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -739,14 +739,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -754,35 +754,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -792,21 +792,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -852,25 +852,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -878,14 +878,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -893,14 +893,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -908,35 +908,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -946,21 +946,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1006,25 +1006,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1032,14 +1032,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1047,14 +1047,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1062,35 +1062,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1100,21 +1100,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1160,25 +1160,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * event_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr event ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1186,14 +1186,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1201,14 +1201,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1216,35 +1216,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1254,21 +1254,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1314,10 +1314,10 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1325,56 +1325,56 @@ TAO_NAMESPACE POA_IR void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::ComponentDef_ptr base_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::ProvidesDefSeq * provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::UsesDefSeq * uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::EmitsDefSeq * emits_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::PublishesDefSeq * publishes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::ConsumesDefSeq * consumes_events ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1385,7 +1385,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1397,7 +1397,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1408,7 +1408,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1419,7 +1419,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1430,14 +1430,14 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1445,7 +1445,7 @@ TAO_NAMESPACE POA_IR void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1453,14 +1453,14 @@ TAO_NAMESPACE POA_IR CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1472,7 +1472,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1487,7 +1487,7 @@ TAO_NAMESPACE POA_IR const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1495,7 +1495,7 @@ TAO_NAMESPACE POA_IR CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1504,7 +1504,7 @@ TAO_NAMESPACE POA_IR CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1515,7 +1515,7 @@ TAO_NAMESPACE POA_IR CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1525,7 +1525,7 @@ TAO_NAMESPACE POA_IR CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1535,7 +1535,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1547,7 +1547,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1558,7 +1558,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1570,7 +1570,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1581,7 +1581,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1592,7 +1592,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1603,7 +1603,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1620,7 +1620,7 @@ TAO_NAMESPACE POA_IR const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1631,7 +1631,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1642,7 +1642,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1652,7 +1652,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1663,7 +1663,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1674,14 +1674,14 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1689,14 +1689,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1704,14 +1704,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1719,35 +1719,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1757,28 +1757,28 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1824,25 +1824,25 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean is_a ( const char * primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1850,14 +1850,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1865,14 +1865,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1880,35 +1880,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1918,21 +1918,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1978,17 +1978,17 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1996,14 +1996,14 @@ TAO_NAMESPACE POA_IR void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2011,14 +2011,14 @@ TAO_NAMESPACE POA_IR void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2026,14 +2026,14 @@ TAO_NAMESPACE POA_IR void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2041,14 +2041,14 @@ TAO_NAMESPACE POA_IR void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2056,14 +2056,14 @@ TAO_NAMESPACE POA_IR void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2071,14 +2071,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2086,14 +2086,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2101,35 +2101,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2139,21 +2139,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2199,17 +2199,17 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2217,14 +2217,14 @@ TAO_NAMESPACE POA_IR void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ParDescriptionSeq * params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2232,14 +2232,14 @@ TAO_NAMESPACE POA_IR void params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2247,14 +2247,14 @@ TAO_NAMESPACE POA_IR void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ContextIdSeq * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2262,14 +2262,14 @@ TAO_NAMESPACE POA_IR void contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ExceptionDefSeq * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2277,14 +2277,14 @@ TAO_NAMESPACE POA_IR void exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2292,14 +2292,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2307,14 +2307,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2322,35 +2322,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2360,21 +2360,21 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2420,45 +2420,45 @@ TAO_NAMESPACE POA_IR // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); IR::HomeDef_ptr base_home ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::ComponentDef_ptr managed_component ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::PrimaryKeyDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::FactoryDefSeq * factories ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); IR::FinderDefSeq * finders ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_basic ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2469,7 +2469,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2481,7 +2481,7 @@ TAO_NAMESPACE POA_IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2493,14 +2493,14 @@ TAO_NAMESPACE POA_IR const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDefSeq * base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2508,7 +2508,7 @@ TAO_NAMESPACE POA_IR void base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2516,14 +2516,14 @@ TAO_NAMESPACE POA_IR CORBA::Boolean is_a ( const char * interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InterfaceDef::FullInterfaceDescription * describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2535,7 +2535,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2550,7 +2550,7 @@ TAO_NAMESPACE POA_IR const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2558,7 +2558,7 @@ TAO_NAMESPACE POA_IR CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2567,7 +2567,7 @@ TAO_NAMESPACE POA_IR CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2578,7 +2578,7 @@ TAO_NAMESPACE POA_IR CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2588,7 +2588,7 @@ TAO_NAMESPACE POA_IR CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2598,7 +2598,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2610,7 +2610,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2621,7 +2621,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2633,7 +2633,7 @@ TAO_NAMESPACE POA_IR const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2644,7 +2644,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2655,7 +2655,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2666,7 +2666,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2683,7 +2683,7 @@ TAO_NAMESPACE POA_IR const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2694,7 +2694,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2705,7 +2705,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2715,7 +2715,7 @@ TAO_NAMESPACE POA_IR const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2726,7 +2726,7 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2737,14 +2737,14 @@ TAO_NAMESPACE POA_IR const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2752,14 +2752,14 @@ TAO_NAMESPACE POA_IR void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2767,14 +2767,14 @@ TAO_NAMESPACE POA_IR void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2782,35 +2782,35 @@ TAO_NAMESPACE POA_IR void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -2820,28 +2820,28 @@ TAO_NAMESPACE POA_IR CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i index 6742e31f286..4b3ff1655a0 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i @@ -90,12 +90,12 @@ POA_IR::ComponentRepository_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::ComponentRepository_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ComponentRepository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ComponentRepository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ComponentRepository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE @@ -105,7 +105,7 @@ IR::ComponentDef_ptr POA_IR::ComponentRepository_tie<T>::create_component ( const char * version, IR::ComponentDef_ptr base_component, const CORBA_InterfaceDefSeq & supports_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -117,7 +117,7 @@ id, version, base_component, supports_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -129,7 +129,7 @@ IR::HomeDef_ptr POA_IR::ComponentRepository_tie<T>::create_home ( IR::HomeDef_ptr base_home, IR::ComponentDef_ptr managed_component, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -142,14 +142,14 @@ id, base_home, managed_component, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup_id ( const char * search_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -157,14 +157,14 @@ CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup_id ( { return this->ptr_->lookup_id ( search_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_IR::ComponentRepository_tie<T>::get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -172,14 +172,14 @@ CORBA::TypeCode_ptr POA_IR::ComponentRepository_tie<T>::get_canonical_typecode { return this->ptr_->get_canonical_typecode ( tc - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -187,14 +187,14 @@ CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive ( { return this->ptr_->get_primitive ( kind - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_StringDef_ptr POA_IR::ComponentRepository_tie<T>::create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -202,14 +202,14 @@ CORBA_StringDef_ptr POA_IR::ComponentRepository_tie<T>::create_string ( { return this->ptr_->create_string ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie<T>::create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -217,7 +217,7 @@ CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie<T>::create_wstring ( { return this->ptr_->create_wstring ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -225,7 +225,7 @@ template <class T> ACE_INLINE CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -234,7 +234,7 @@ CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence ( return this->ptr_->create_sequence ( bound, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -242,7 +242,7 @@ template <class T> ACE_INLINE CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -251,7 +251,7 @@ CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array ( return this->ptr_->create_array ( length, element_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -259,7 +259,7 @@ template <class T> ACE_INLINE CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -268,14 +268,14 @@ CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed ( return this->ptr_->create_fixed ( digits, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -283,7 +283,7 @@ CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -291,7 +291,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -300,7 +300,7 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -310,7 +310,7 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -321,7 +321,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -330,7 +330,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_c CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -340,7 +340,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_c limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -349,7 +349,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -359,7 +359,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -370,7 +370,7 @@ CORBA_ConstantDef_ptr POA_IR::ComponentRepository_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -382,7 +382,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -392,7 +392,7 @@ CORBA_StructDef_ptr POA_IR::ComponentRepository_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -403,7 +403,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -414,7 +414,7 @@ CORBA_UnionDef_ptr POA_IR::ComponentRepository_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -426,7 +426,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -436,7 +436,7 @@ CORBA_EnumDef_ptr POA_IR::ComponentRepository_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -447,7 +447,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -457,7 +457,7 @@ CORBA_AliasDef_ptr POA_IR::ComponentRepository_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -468,7 +468,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -478,7 +478,7 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -489,7 +489,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -505,7 +505,7 @@ CORBA_ValueDef_ptr POA_IR::ComponentRepository_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -522,7 +522,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -532,7 +532,7 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentRepository_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -543,7 +543,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -553,7 +553,7 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentRepository_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -564,7 +564,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -573,7 +573,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -583,7 +583,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -593,7 +593,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_abstra const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -604,7 +604,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -614,7 +614,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_local_int const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -625,33 +625,33 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::ComponentRepository_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ComponentRepository_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -724,44 +724,44 @@ POA_IR::ProvidesDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::ProvidesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ProvidesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ProvidesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ProvidesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_InterfaceDef_ptr POA_IR::ProvidesDef_tie<T>::interface_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ProvidesDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ProvidesDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -769,27 +769,27 @@ void POA_IR::ProvidesDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ProvidesDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ProvidesDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -797,27 +797,27 @@ void POA_IR::ProvidesDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ProvidesDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ProvidesDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -825,59 +825,59 @@ void POA_IR::ProvidesDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::ProvidesDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ProvidesDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::ProvidesDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::ProvidesDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -886,7 +886,7 @@ void POA_IR::ProvidesDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -896,33 +896,33 @@ void POA_IR::ProvidesDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::ProvidesDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ProvidesDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -995,57 +995,57 @@ POA_IR::UsesDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::UsesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::UsesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->UsesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->UsesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_InterfaceDef_ptr POA_IR::UsesDef_tie<T>::interface_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->interface_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::UsesDef_tie<T>::is_multiple ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_multiple ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::UsesDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::UsesDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1053,27 +1053,27 @@ void POA_IR::UsesDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::UsesDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::UsesDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1081,27 +1081,27 @@ void POA_IR::UsesDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::UsesDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::UsesDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1109,59 +1109,59 @@ void POA_IR::UsesDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::UsesDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::UsesDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::UsesDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::UsesDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1170,7 +1170,7 @@ void POA_IR::UsesDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1180,33 +1180,33 @@ void POA_IR::UsesDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::UsesDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::UsesDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1279,18 +1279,18 @@ POA_IR::EventDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::EventDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::EventDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->EventDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->EventDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::EventDef_tie<T>::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1298,40 +1298,40 @@ CORBA::Boolean POA_IR::EventDef_tie<T>::is_a ( { return this->ptr_->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ValueDef_ptr POA_IR::EventDef_tie<T>::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::EventDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::EventDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1339,27 +1339,27 @@ void POA_IR::EventDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::EventDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::EventDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1367,27 +1367,27 @@ void POA_IR::EventDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::EventDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::EventDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1395,59 +1395,59 @@ void POA_IR::EventDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::EventDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::EventDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::EventDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::EventDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1456,7 +1456,7 @@ void POA_IR::EventDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1466,33 +1466,33 @@ void POA_IR::EventDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::EventDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::EventDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1565,18 +1565,18 @@ POA_IR::EmitsDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::EmitsDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::EmitsDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->EmitsDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->EmitsDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::EmitsDef_tie<T>::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1584,40 +1584,40 @@ CORBA::Boolean POA_IR::EmitsDef_tie<T>::is_a ( { return this->ptr_->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ValueDef_ptr POA_IR::EmitsDef_tie<T>::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::EmitsDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::EmitsDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1625,27 +1625,27 @@ void POA_IR::EmitsDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::EmitsDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::EmitsDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1653,27 +1653,27 @@ void POA_IR::EmitsDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::EmitsDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::EmitsDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1681,59 +1681,59 @@ void POA_IR::EmitsDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::EmitsDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::EmitsDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::EmitsDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::EmitsDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1742,7 +1742,7 @@ void POA_IR::EmitsDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1752,33 +1752,33 @@ void POA_IR::EmitsDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::EmitsDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::EmitsDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1851,18 +1851,18 @@ POA_IR::PublishesDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::PublishesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::PublishesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->PublishesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->PublishesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::PublishesDef_tie<T>::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1870,40 +1870,40 @@ CORBA::Boolean POA_IR::PublishesDef_tie<T>::is_a ( { return this->ptr_->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ValueDef_ptr POA_IR::PublishesDef_tie<T>::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::PublishesDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::PublishesDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1911,27 +1911,27 @@ void POA_IR::PublishesDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::PublishesDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::PublishesDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1939,27 +1939,27 @@ void POA_IR::PublishesDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::PublishesDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::PublishesDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1967,59 +1967,59 @@ void POA_IR::PublishesDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::PublishesDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::PublishesDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::PublishesDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::PublishesDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2028,7 +2028,7 @@ void POA_IR::PublishesDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2038,33 +2038,33 @@ void POA_IR::PublishesDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::PublishesDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::PublishesDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2137,18 +2137,18 @@ POA_IR::ConsumesDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::ConsumesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ConsumesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ConsumesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ConsumesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::ConsumesDef_tie<T>::is_a ( const char * event_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2156,40 +2156,40 @@ CORBA::Boolean POA_IR::ConsumesDef_tie<T>::is_a ( { return this->ptr_->is_a ( event_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ValueDef_ptr POA_IR::ConsumesDef_tie<T>::event ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->event ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ConsumesDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ConsumesDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2197,27 +2197,27 @@ void POA_IR::ConsumesDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ConsumesDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ConsumesDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2225,27 +2225,27 @@ void POA_IR::ConsumesDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ConsumesDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ConsumesDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2253,59 +2253,59 @@ void POA_IR::ConsumesDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::ConsumesDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ConsumesDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::ConsumesDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::ConsumesDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2314,7 +2314,7 @@ void POA_IR::ConsumesDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2324,33 +2324,33 @@ void POA_IR::ConsumesDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::ConsumesDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ConsumesDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2423,31 +2423,31 @@ POA_IR::ComponentDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::ComponentDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::ComponentDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->ComponentDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ComponentDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ComponentDef_tie<T>::supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2455,98 +2455,98 @@ void POA_IR::ComponentDef_tie<T>::supported_interfaces ( { this->ptr_->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::ComponentDef_ptr POA_IR::ComponentDef_tie<T>::base_component ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::ProvidesDefSeq * POA_IR::ComponentDef_tie<T>::provides_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->provides_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::UsesDefSeq * POA_IR::ComponentDef_tie<T>::uses_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->uses_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::EmitsDefSeq * POA_IR::ComponentDef_tie<T>::emits_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->emits_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::PublishesDefSeq * POA_IR::ComponentDef_tie<T>::publishes_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->publishes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::ConsumesDefSeq * POA_IR::ComponentDef_tie<T>::consumes_events ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->consumes_events ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_basic ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2556,7 +2556,7 @@ IR::ProvidesDef_ptr POA_IR::ComponentDef_tie<T>::create_provides ( const char * name, const char * version, CORBA_InterfaceDef_ptr interface_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2567,7 +2567,7 @@ id, name, version, interface_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2578,7 +2578,7 @@ IR::UsesDef_ptr POA_IR::ComponentDef_tie<T>::create_uses ( const char * version, CORBA_InterfaceDef_ptr interface_type, CORBA::Boolean is_multiple - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2590,7 +2590,7 @@ id, version, interface_type, is_multiple - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2600,7 +2600,7 @@ IR::EmitsDef_ptr POA_IR::ComponentDef_tie<T>::create_emits ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2611,7 +2611,7 @@ id, name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2621,7 +2621,7 @@ IR::PublishesDef_ptr POA_IR::ComponentDef_tie<T>::create_publishes ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2632,7 +2632,7 @@ id, name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2642,7 +2642,7 @@ IR::ConsumesDef_ptr POA_IR::ComponentDef_tie<T>::create_consumes ( const char * name, const char * version, CORBA_ValueDef_ptr value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2653,27 +2653,27 @@ id, name, version, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ComponentDef_tie<T>::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2681,14 +2681,14 @@ void POA_IR::ComponentDef_tie<T>::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2696,20 +2696,20 @@ CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::ComponentDef_tie<T>::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -2720,7 +2720,7 @@ CORBA_AttributeDef_ptr POA_IR::ComponentDef_tie<T>::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2732,7 +2732,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2746,7 +2746,7 @@ CORBA_OperationDef_ptr POA_IR::ComponentDef_tie<T>::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2761,14 +2761,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_IR::ComponentDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2776,7 +2776,7 @@ CORBA_Contained_ptr POA_IR::ComponentDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2784,7 +2784,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2793,7 +2793,7 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2803,7 +2803,7 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2814,7 +2814,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2823,7 +2823,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2833,7 +2833,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2842,7 +2842,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2852,7 +2852,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2863,7 +2863,7 @@ CORBA_ConstantDef_ptr POA_IR::ComponentDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2875,7 +2875,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2885,7 +2885,7 @@ CORBA_StructDef_ptr POA_IR::ComponentDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2896,7 +2896,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2907,7 +2907,7 @@ CORBA_UnionDef_ptr POA_IR::ComponentDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2919,7 +2919,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2929,7 +2929,7 @@ CORBA_EnumDef_ptr POA_IR::ComponentDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2940,7 +2940,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2950,7 +2950,7 @@ CORBA_AliasDef_ptr POA_IR::ComponentDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2961,7 +2961,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2971,7 +2971,7 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2982,7 +2982,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2998,7 +2998,7 @@ CORBA_ValueDef_ptr POA_IR::ComponentDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3015,7 +3015,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3025,7 +3025,7 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3036,7 +3036,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3046,7 +3046,7 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3057,7 +3057,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3066,7 +3066,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3076,7 +3076,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3086,7 +3086,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_abstract_inte const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3097,7 +3097,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -3107,7 +3107,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_local_interface const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3118,27 +3118,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ComponentDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ComponentDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3146,27 +3146,27 @@ void POA_IR::ComponentDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ComponentDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ComponentDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3174,27 +3174,27 @@ void POA_IR::ComponentDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ComponentDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ComponentDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3202,59 +3202,59 @@ void POA_IR::ComponentDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::ComponentDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::ComponentDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::ComponentDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::ComponentDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3263,7 +3263,7 @@ void POA_IR::ComponentDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3273,46 +3273,46 @@ void POA_IR::ComponentDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_IR::ComponentDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::ComponentDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::ComponentDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3385,18 +3385,18 @@ POA_IR::PrimaryKeyDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::PrimaryKeyDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::PrimaryKeyDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->PrimaryKeyDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->PrimaryKeyDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::PrimaryKeyDef_tie<T>::is_a ( const char * primary_key_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3404,40 +3404,40 @@ CORBA::Boolean POA_IR::PrimaryKeyDef_tie<T>::is_a ( { return this->ptr_->is_a ( primary_key_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ValueDef_ptr POA_IR::PrimaryKeyDef_tie<T>::primary_key ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::PrimaryKeyDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::PrimaryKeyDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3445,27 +3445,27 @@ void POA_IR::PrimaryKeyDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::PrimaryKeyDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::PrimaryKeyDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3473,27 +3473,27 @@ void POA_IR::PrimaryKeyDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::PrimaryKeyDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::PrimaryKeyDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3501,59 +3501,59 @@ void POA_IR::PrimaryKeyDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::PrimaryKeyDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::PrimaryKeyDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::PrimaryKeyDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::PrimaryKeyDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3562,7 +3562,7 @@ void POA_IR::PrimaryKeyDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3572,33 +3572,33 @@ void POA_IR::PrimaryKeyDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::PrimaryKeyDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::PrimaryKeyDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3671,44 +3671,44 @@ POA_IR::FactoryDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::FactoryDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::FactoryDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->FactoryDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->FactoryDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_IR::FactoryDef_tie<T>::result ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_IR::FactoryDef_tie<T>::result_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3716,27 +3716,27 @@ void POA_IR::FactoryDef_tie<T>::result_def ( { this->ptr_->result_def ( result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ParDescriptionSeq * POA_IR::FactoryDef_tie<T>::params ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3744,27 +3744,27 @@ void POA_IR::FactoryDef_tie<T>::params ( { this->ptr_->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::OperationMode POA_IR::FactoryDef_tie<T>::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3772,27 +3772,27 @@ void POA_IR::FactoryDef_tie<T>::mode ( { this->ptr_->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ContextIdSeq * POA_IR::FactoryDef_tie<T>::contexts ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3800,27 +3800,27 @@ void POA_IR::FactoryDef_tie<T>::contexts ( { this->ptr_->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ExceptionDefSeq * POA_IR::FactoryDef_tie<T>::exceptions ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3828,27 +3828,27 @@ void POA_IR::FactoryDef_tie<T>::exceptions ( { this->ptr_->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::FactoryDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3856,27 +3856,27 @@ void POA_IR::FactoryDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::FactoryDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3884,27 +3884,27 @@ void POA_IR::FactoryDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::FactoryDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3912,59 +3912,59 @@ void POA_IR::FactoryDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::FactoryDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::FactoryDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::FactoryDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::FactoryDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -3973,7 +3973,7 @@ void POA_IR::FactoryDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3983,33 +3983,33 @@ void POA_IR::FactoryDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::FactoryDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FactoryDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4082,44 +4082,44 @@ POA_IR::FinderDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::FinderDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::FinderDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->FinderDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->FinderDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_IR::FinderDef_tie<T>::result ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_IR::FinderDef_tie<T>::result_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->result_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4127,27 +4127,27 @@ void POA_IR::FinderDef_tie<T>::result_def ( { this->ptr_->result_def ( result_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ParDescriptionSeq * POA_IR::FinderDef_tie<T>::params ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->params ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::params ( const CORBA_ParDescriptionSeq & params - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4155,27 +4155,27 @@ void POA_IR::FinderDef_tie<T>::params ( { this->ptr_->params ( params - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::OperationMode POA_IR::FinderDef_tie<T>::mode ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->mode ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4183,27 +4183,27 @@ void POA_IR::FinderDef_tie<T>::mode ( { this->ptr_->mode ( mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ContextIdSeq * POA_IR::FinderDef_tie<T>::contexts ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->contexts ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::contexts ( const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4211,27 +4211,27 @@ void POA_IR::FinderDef_tie<T>::contexts ( { this->ptr_->contexts ( contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ExceptionDefSeq * POA_IR::FinderDef_tie<T>::exceptions ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->exceptions ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::exceptions ( const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4239,27 +4239,27 @@ void POA_IR::FinderDef_tie<T>::exceptions ( { this->ptr_->exceptions ( exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::FinderDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4267,27 +4267,27 @@ void POA_IR::FinderDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::FinderDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4295,27 +4295,27 @@ void POA_IR::FinderDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::FinderDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4323,59 +4323,59 @@ void POA_IR::FinderDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::FinderDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::FinderDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::FinderDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::FinderDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4384,7 +4384,7 @@ void POA_IR::FinderDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4394,33 +4394,33 @@ void POA_IR::FinderDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::FinderDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::FinderDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4493,89 +4493,89 @@ POA_IR::HomeDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_IR::HomeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_IR::HomeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->HomeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->HomeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE IR::HomeDef_ptr POA_IR::HomeDef_tie<T>::base_home ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_home ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::ComponentDef_ptr POA_IR::HomeDef_tie<T>::managed_component ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->managed_component ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::primary_key ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->primary_key ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::FactoryDefSeq * POA_IR::HomeDef_tie<T>::factories ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->factories ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE IR::FinderDefSeq * POA_IR::HomeDef_tie<T>::finders ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->finders ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::HomeDef_tie<T>::is_basic ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_basic ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4585,7 +4585,7 @@ IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::create_primary_key ( const char * name, const char * version, CORBA_ValueDef_ptr primary_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4596,7 +4596,7 @@ id, name, version, primary_key - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4607,7 +4607,7 @@ IR::FactoryDef_ptr POA_IR::HomeDef_tie<T>::create_factory ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4619,7 +4619,7 @@ id, version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4630,7 +4630,7 @@ IR::FinderDef_ptr POA_IR::HomeDef_tie<T>::create_finder ( const char * version, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4642,27 +4642,27 @@ id, version, params, exceptions - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_InterfaceDefSeq * POA_IR::HomeDef_tie<T>::base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::HomeDef_tie<T>::base_interfaces ( const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4670,14 +4670,14 @@ void POA_IR::HomeDef_tie<T>::base_interfaces ( { this->ptr_->base_interfaces ( base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_IR::HomeDef_tie<T>::is_a ( const char * interface_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4685,20 +4685,20 @@ CORBA::Boolean POA_IR::HomeDef_tie<T>::is_a ( { return this->ptr_->is_a ( interface_id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::HomeDef_tie<T>::describe_interface ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_interface ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4709,7 +4709,7 @@ CORBA_AttributeDef_ptr POA_IR::HomeDef_tie<T>::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4721,7 +4721,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4735,7 +4735,7 @@ CORBA_OperationDef_ptr POA_IR::HomeDef_tie<T>::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4750,14 +4750,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_IR::HomeDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4765,7 +4765,7 @@ CORBA_Contained_ptr POA_IR::HomeDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4773,7 +4773,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4782,7 +4782,7 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4792,7 +4792,7 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4803,7 +4803,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4812,7 +4812,7 @@ CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4822,7 +4822,7 @@ CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents ( limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4831,7 +4831,7 @@ CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4841,7 +4841,7 @@ CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4852,7 +4852,7 @@ CORBA_ConstantDef_ptr POA_IR::HomeDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4864,7 +4864,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4874,7 +4874,7 @@ CORBA_StructDef_ptr POA_IR::HomeDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4885,7 +4885,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4896,7 +4896,7 @@ CORBA_UnionDef_ptr POA_IR::HomeDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4908,7 +4908,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4918,7 +4918,7 @@ CORBA_EnumDef_ptr POA_IR::HomeDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4929,7 +4929,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4939,7 +4939,7 @@ CORBA_AliasDef_ptr POA_IR::HomeDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4950,7 +4950,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4960,7 +4960,7 @@ CORBA_InterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4971,7 +4971,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -4987,7 +4987,7 @@ CORBA_ValueDef_ptr POA_IR::HomeDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5004,7 +5004,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5014,7 +5014,7 @@ CORBA_ValueBoxDef_ptr POA_IR::HomeDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5025,7 +5025,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5035,7 +5035,7 @@ CORBA_ExceptionDef_ptr POA_IR::HomeDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5046,7 +5046,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5055,7 +5055,7 @@ CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5065,7 +5065,7 @@ CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5075,7 +5075,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_abstract_interface const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5086,7 +5086,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5096,7 +5096,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_local_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5107,27 +5107,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::HomeDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::HomeDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5135,27 +5135,27 @@ void POA_IR::HomeDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::HomeDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::HomeDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5163,27 +5163,27 @@ void POA_IR::HomeDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::HomeDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::HomeDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5191,59 +5191,59 @@ void POA_IR::HomeDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_IR::HomeDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_IR::HomeDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_IR::HomeDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_IR::HomeDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -5252,7 +5252,7 @@ void POA_IR::HomeDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5262,46 +5262,46 @@ void POA_IR::HomeDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_IR::HomeDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_IR::HomeDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_IR::HomeDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp index 60601af3a69..66afb133074 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp @@ -186,31 +186,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::UShort result); @@ -228,44 +228,44 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_Fix TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_FixedDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -277,7 +277,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -287,10 +287,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -308,31 +308,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl , const CORBA::UShort & digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -351,7 +351,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_FixedDef *tao_impl, const CORBA::UShort & digits - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -359,12 +359,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -380,25 +380,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_D } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -406,7 +406,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL char * TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -416,10 +416,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestInfo @@ -429,31 +429,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Short result); @@ -471,44 +471,44 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_Fixe TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_FixedDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -520,7 +520,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -530,10 +530,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -551,31 +551,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl , const CORBA::Short & scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -594,7 +594,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_FixedDef *tao_impl, const CORBA::Short & scale - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -602,12 +602,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -623,25 +623,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -649,7 +649,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -659,10 +659,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -695,17 +695,17 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::~_TAO_CORBA_FixedDef_Strategized_P _TAO_CORBA_FixedDef_Proxy_Impl& _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_FixedDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -715,7 +715,7 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -785,7 +785,7 @@ _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl ( CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -801,7 +801,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( _collocated_tao_target_->_object_key (), "digits", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -810,14 +810,14 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( "IDL:omg.org/CORBA/FixedDef:1.0" ) )->digits ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -831,7 +831,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( _collocated_tao_target_->_object_key (), "digits", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -841,14 +841,14 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( ) )->digits ( digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -864,7 +864,7 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( _collocated_tao_target_->_object_key (), "scale", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -873,14 +873,14 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( "IDL:omg.org/CORBA/FixedDef:1.0" ) )->scale ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( CORBA_Object *_collocated_tao_target_, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -894,7 +894,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( _collocated_tao_target_->_object_key (), "scale", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -904,7 +904,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( ) )->scale ( scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -935,7 +935,7 @@ void POA_CORBA_FixedDef::_get_digits_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_FixedDef *_tao_impl = @@ -956,18 +956,18 @@ void POA_CORBA_FixedDef::_get_digits_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->digits ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -975,7 +975,7 @@ void POA_CORBA_FixedDef::_get_digits_skel ( CORBA::UShort _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -983,12 +983,12 @@ void POA_CORBA_FixedDef::_get_digits_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1016,7 +1016,7 @@ void POA_CORBA_FixedDef::_set_digits_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1045,25 +1045,25 @@ void POA_CORBA_FixedDef::_set_digits_skel ( _tao_upcall, _tao_impl, digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->digits ( digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1071,12 +1071,12 @@ void POA_CORBA_FixedDef::_set_digits_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1097,7 +1097,7 @@ void POA_CORBA_FixedDef::_get_scale_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_FixedDef *_tao_impl = @@ -1118,18 +1118,18 @@ void POA_CORBA_FixedDef::_get_scale_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->scale ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1137,7 +1137,7 @@ void POA_CORBA_FixedDef::_get_scale_skel ( CORBA::Short _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1145,12 +1145,12 @@ void POA_CORBA_FixedDef::_get_scale_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1178,7 +1178,7 @@ void POA_CORBA_FixedDef::_set_scale_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1207,25 +1207,25 @@ void POA_CORBA_FixedDef::_set_scale_skel ( _tao_upcall, _tao_impl, scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->scale ( scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1233,12 +1233,12 @@ void POA_CORBA_FixedDef::_set_scale_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1259,7 +1259,7 @@ void POA_CORBA_FixedDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1269,7 +1269,7 @@ void POA_CORBA_FixedDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1282,11 +1282,11 @@ void POA_CORBA_FixedDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1299,7 +1299,7 @@ void POA_CORBA_FixedDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference; @@ -1318,7 +1318,7 @@ void POA_CORBA_FixedDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1345,10 +1345,10 @@ void POA_CORBA_FixedDef::_interface_skel ( CORBA::Boolean POA_CORBA_FixedDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1376,12 +1376,12 @@ void* POA_CORBA_FixedDef::_downcast ( return 0; } -void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -1391,9 +1391,9 @@ const char* POA_CORBA_FixedDef::_interface_repository_id (void) const } CORBA_FixedDef* -POA_CORBA_FixedDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -1564,31 +1564,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::TypeCode_ptr result); @@ -1606,44 +1606,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1655,7 +1655,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1665,10 +1665,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1685,31 +1685,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -1727,44 +1727,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -1776,7 +1776,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1786,10 +1786,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -1807,31 +1807,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1850,7 +1850,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1858,12 +1858,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -1879,25 +1879,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -1905,7 +1905,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1915,10 +1915,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerRequestInfo @@ -1928,31 +1928,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Visibility result); @@ -1970,44 +1970,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -2019,7 +2019,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2029,10 +2029,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -2050,31 +2050,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl , const CORBA::Visibility & access - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2093,7 +2093,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueMemberDef *tao_impl, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2101,12 +2101,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -2122,25 +2122,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -2148,7 +2148,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2158,10 +2158,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -2194,17 +2194,17 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_S _TAO_CORBA_ValueMemberDef_Proxy_Impl& _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ValueMemberDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -2214,7 +2214,7 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2284,7 +2284,7 @@ _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueMemberDef_ThruPOA_ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2300,7 +2300,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type ( _collocated_tao_target_->_object_key (), "type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2309,13 +2309,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2331,7 +2331,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2340,14 +2340,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2361,7 +2361,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( _collocated_tao_target_->_object_key (), "type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2371,14 +2371,14 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( ) )->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2394,7 +2394,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( _collocated_tao_target_->_object_key (), "access", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -2403,14 +2403,14 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->access ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( CORBA_Object *_collocated_tao_target_, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2424,7 +2424,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( _collocated_tao_target_->_object_key (), "access", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2434,7 +2434,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( ) )->access ( access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2465,7 +2465,7 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = @@ -2486,18 +2486,18 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2506,7 +2506,7 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2514,12 +2514,12 @@ void POA_CORBA_ValueMemberDef::_get_type_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2547,7 +2547,7 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = @@ -2568,18 +2568,18 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2588,7 +2588,7 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2596,12 +2596,12 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2629,7 +2629,7 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2658,25 +2658,25 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( _tao_upcall, _tao_impl, type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->type_def ( type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2684,12 +2684,12 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2710,7 +2710,7 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = @@ -2731,18 +2731,18 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->access ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2750,7 +2750,7 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( CORBA::Visibility _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2758,12 +2758,12 @@ void POA_CORBA_ValueMemberDef::_get_access_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2791,7 +2791,7 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2820,25 +2820,25 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( _tao_upcall, _tao_impl, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->access ( access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2846,12 +2846,12 @@ void POA_CORBA_ValueMemberDef::_set_access_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -2872,7 +2872,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -2882,7 +2882,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2895,11 +2895,11 @@ void POA_CORBA_ValueMemberDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -2912,7 +2912,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference; @@ -2931,7 +2931,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -2958,10 +2958,10 @@ void POA_CORBA_ValueMemberDef::_interface_skel ( CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -2989,12 +2989,12 @@ void* POA_CORBA_ValueMemberDef::_downcast ( return 0; } -void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -3004,9 +3004,9 @@ const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const } CORBA_ValueMemberDef* -POA_CORBA_ValueMemberDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -3213,31 +3213,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InterfaceDefSeq * result); @@ -3255,44 +3255,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequest TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3304,7 +3304,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3314,10 +3314,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3335,31 +3335,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3378,7 +3378,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3386,12 +3386,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3407,25 +3407,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3433,7 +3433,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3443,10 +3443,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerRequestInfo @@ -3456,31 +3456,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_InitializerSeq * result); @@ -3498,44 +3498,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_COR TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3547,7 +3547,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3557,10 +3557,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3578,31 +3578,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3621,7 +3621,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3629,12 +3629,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3650,25 +3650,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3676,7 +3676,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3686,10 +3686,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerRequestInfo @@ -3699,31 +3699,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef_ptr result); @@ -3741,44 +3741,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -3790,7 +3790,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3800,10 +3800,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -3821,31 +3821,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3864,7 +3864,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -3872,12 +3872,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -3893,25 +3893,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -3919,7 +3919,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -3929,10 +3929,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo @@ -3942,31 +3942,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDefSeq * result); @@ -3984,44 +3984,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequest TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4033,7 +4033,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4043,10 +4043,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4064,31 +4064,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4107,7 +4107,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4115,12 +4115,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4136,25 +4136,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4162,7 +4162,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4172,10 +4172,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRequestInfo @@ -4185,31 +4185,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4227,44 +4227,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORB TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4276,7 +4276,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4286,10 +4286,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4307,31 +4307,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4350,7 +4350,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA::Boolean & is_abstract - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4358,12 +4358,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4379,25 +4379,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4405,7 +4405,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG char * TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4415,10 +4415,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequestInfo @@ -4428,31 +4428,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4470,44 +4470,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4519,7 +4519,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4529,10 +4529,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4550,31 +4550,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4593,7 +4593,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA::Boolean & is_custom - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4601,12 +4601,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4622,25 +4622,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_AR } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4648,7 +4648,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4658,10 +4658,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_ServerRequestInfo @@ -4671,31 +4671,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4713,44 +4713,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -4762,7 +4762,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4772,10 +4772,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -4793,31 +4793,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const CORBA::Boolean & is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -4836,7 +4836,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const CORBA::Boolean & is_truncatable - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4844,12 +4844,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4865,25 +4865,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SING } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -4891,7 +4891,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ char * TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4901,10 +4901,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo @@ -4915,31 +4915,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl , const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Boolean result); @@ -4959,7 +4959,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_ TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl, const char * id - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4967,12 +4967,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -4988,25 +4988,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5018,7 +5018,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5028,10 +5028,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5048,31 +5048,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueDef::FullValueDescription * result); @@ -5090,44 +5090,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5139,7 +5139,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_ char * TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5149,10 +5149,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5174,31 +5174,31 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_ValueMemberDef_ptr result); @@ -5226,7 +5226,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_ const char * version, CORBA_IDLType_ptr type, const CORBA::Visibility & access - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5238,12 +5238,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5271,25 +5271,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SIN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5301,7 +5301,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE char * TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5311,10 +5311,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_in CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5336,31 +5336,31 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_AttributeDef_ptr result); @@ -5388,7 +5388,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode & mode - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5400,12 +5400,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5433,25 +5433,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5463,7 +5463,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5473,10 +5473,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5501,31 +5501,31 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_OperationDef_ptr result); @@ -5559,7 +5559,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5574,12 +5574,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -5616,25 +5616,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -5646,7 +5646,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_AR char * TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5656,10 +5656,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -5699,17 +5699,17 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueDef_Strategized_P _TAO_CORBA_ValueDef_Proxy_Impl& _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ValueDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -5719,7 +5719,7 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -5789,7 +5789,7 @@ _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl ( CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5805,7 +5805,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf _collocated_tao_target_->_object_key (), "supported_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -5814,14 +5814,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf "IDL:omg.org/CORBA/ValueDef:1.0" ) )->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5835,7 +5835,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( _collocated_tao_target_->_object_key (), "supported_interfaces", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -5845,14 +5845,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( ) )->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5868,7 +5868,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( _collocated_tao_target_->_object_key (), "initializers", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -5877,14 +5877,14 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->initializers ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( CORBA_Object *_collocated_tao_target_, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5898,7 +5898,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( _collocated_tao_target_->_object_key (), "initializers", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -5908,14 +5908,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( ) )->initializers ( initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5931,7 +5931,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( _collocated_tao_target_->_object_key (), "base_value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -5940,14 +5940,14 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->base_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( CORBA_Object *_collocated_tao_target_, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5961,7 +5961,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( _collocated_tao_target_->_object_key (), "base_value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -5971,14 +5971,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( ) )->base_value ( base_value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5994,7 +5994,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values _collocated_tao_target_->_object_key (), "abstract_base_values", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6003,14 +6003,14 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values "IDL:omg.org/CORBA/ValueDef:1.0" ) )->abstract_base_values ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( CORBA_Object *_collocated_tao_target_, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6024,7 +6024,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( _collocated_tao_target_->_object_key (), "abstract_base_values", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6034,14 +6034,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( ) )->abstract_base_values ( abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6057,7 +6057,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( _collocated_tao_target_->_object_key (), "is_abstract", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -6066,14 +6066,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_abstract ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6087,7 +6087,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( _collocated_tao_target_->_object_key (), "is_abstract", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6097,14 +6097,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( ) )->is_abstract ( is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6120,7 +6120,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( _collocated_tao_target_->_object_key (), "is_custom", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -6129,14 +6129,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_custom ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6150,7 +6150,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( _collocated_tao_target_->_object_key (), "is_custom", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6160,14 +6160,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( ) )->is_custom ( is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6183,7 +6183,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( _collocated_tao_target_->_object_key (), "is_truncatable", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -6192,14 +6192,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_truncatable ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6213,7 +6213,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( _collocated_tao_target_->_object_key (), "is_truncatable", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -6223,7 +6223,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( ) )->is_truncatable ( is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -6231,7 +6231,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6247,7 +6247,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a ( _collocated_tao_target_->_object_key (), "is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -6257,13 +6257,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a ( ) )->is_a ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::describe_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6279,7 +6279,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d _collocated_tao_target_->_object_key (), "describe_value", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6288,7 +6288,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d "IDL:omg.org/CORBA/ValueDef:1.0" ) )->describe_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -6299,7 +6299,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6315,7 +6315,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me _collocated_tao_target_->_object_key (), "create_value_member", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6329,7 +6329,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me version, type, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6340,7 +6340,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6356,7 +6356,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute _collocated_tao_target_->_object_key (), "create_attribute", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6370,7 +6370,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6384,7 +6384,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6400,7 +6400,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation _collocated_tao_target_->_object_key (), "create_operation", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -6417,7 +6417,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6449,7 +6449,7 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -6470,18 +6470,18 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6490,7 +6490,7 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6498,12 +6498,12 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6531,7 +6531,7 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -6560,25 +6560,25 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( _tao_upcall, _tao_impl, supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6586,12 +6586,12 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6612,7 +6612,7 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -6633,18 +6633,18 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->initializers ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6653,7 +6653,7 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6661,12 +6661,12 @@ void POA_CORBA_ValueDef::_get_initializers_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6694,7 +6694,7 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -6723,25 +6723,25 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( _tao_upcall, _tao_impl, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->initializers ( initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6749,12 +6749,12 @@ void POA_CORBA_ValueDef::_set_initializers_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6775,7 +6775,7 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -6796,18 +6796,18 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->base_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6816,7 +6816,7 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6824,12 +6824,12 @@ void POA_CORBA_ValueDef::_get_base_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6857,7 +6857,7 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -6886,25 +6886,25 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( _tao_upcall, _tao_impl, base_value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->base_value ( base_value.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6912,12 +6912,12 @@ void POA_CORBA_ValueDef::_set_base_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -6938,7 +6938,7 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -6959,18 +6959,18 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->abstract_base_values ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6979,7 +6979,7 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -6987,12 +6987,12 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7020,7 +7020,7 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7049,25 +7049,25 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( _tao_upcall, _tao_impl, abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->abstract_base_values ( abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7075,12 +7075,12 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7101,7 +7101,7 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -7122,18 +7122,18 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_abstract ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7141,7 +7141,7 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7149,12 +7149,12 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7182,7 +7182,7 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7211,25 +7211,25 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( _tao_upcall, _tao_impl, is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->is_abstract ( is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7237,12 +7237,12 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7263,7 +7263,7 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -7284,18 +7284,18 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_custom ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7303,7 +7303,7 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7311,12 +7311,12 @@ void POA_CORBA_ValueDef::_get_is_custom_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7344,7 +7344,7 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7373,25 +7373,25 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( _tao_upcall, _tao_impl, is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->is_custom ( is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7399,12 +7399,12 @@ void POA_CORBA_ValueDef::_set_is_custom_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7425,7 +7425,7 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -7446,18 +7446,18 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_truncatable ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7465,7 +7465,7 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7473,12 +7473,12 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7506,7 +7506,7 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7535,25 +7535,25 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( _tao_upcall, _tao_impl, is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->is_truncatable ( is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7561,12 +7561,12 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7587,7 +7587,7 @@ void POA_CORBA_ValueDef::is_a_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7616,19 +7616,19 @@ void POA_CORBA_ValueDef::is_a_skel ( _tao_upcall, _tao_impl, id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->is_a ( id.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7636,7 +7636,7 @@ void POA_CORBA_ValueDef::is_a_skel ( CORBA::Boolean _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7644,12 +7644,12 @@ void POA_CORBA_ValueDef::is_a_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7677,7 +7677,7 @@ void POA_CORBA_ValueDef::describe_value_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = @@ -7698,18 +7698,18 @@ void POA_CORBA_ValueDef::describe_value_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->describe_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7718,7 +7718,7 @@ void POA_CORBA_ValueDef::describe_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7726,12 +7726,12 @@ void POA_CORBA_ValueDef::describe_value_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7759,7 +7759,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7800,12 +7800,12 @@ void POA_CORBA_ValueDef::create_value_member_skel ( version.in (), type.in (), access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7816,7 +7816,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( version.in (), type.in (), access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7825,7 +7825,7 @@ void POA_CORBA_ValueDef::create_value_member_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7833,12 +7833,12 @@ void POA_CORBA_ValueDef::create_value_member_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7866,7 +7866,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -7907,12 +7907,12 @@ void POA_CORBA_ValueDef::create_attribute_skel ( version.in (), type.in (), mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -7923,7 +7923,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( version.in (), type.in (), mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7932,7 +7932,7 @@ void POA_CORBA_ValueDef::create_attribute_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -7940,12 +7940,12 @@ void POA_CORBA_ValueDef::create_attribute_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -7973,7 +7973,7 @@ void POA_CORBA_ValueDef::create_operation_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8023,12 +8023,12 @@ void POA_CORBA_ValueDef::create_operation_skel ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ @@ -8042,7 +8042,7 @@ void POA_CORBA_ValueDef::create_operation_skel ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8051,7 +8051,7 @@ void POA_CORBA_ValueDef::create_operation_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8059,12 +8059,12 @@ void POA_CORBA_ValueDef::create_operation_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8092,7 +8092,7 @@ void POA_CORBA_ValueDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8102,7 +8102,7 @@ void POA_CORBA_ValueDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8115,11 +8115,11 @@ void POA_CORBA_ValueDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -8132,7 +8132,7 @@ void POA_CORBA_ValueDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference; @@ -8151,7 +8151,7 @@ void POA_CORBA_ValueDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -8178,10 +8178,10 @@ void POA_CORBA_ValueDef::_interface_skel ( CORBA::Boolean POA_CORBA_ValueDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -8215,12 +8215,12 @@ void* POA_CORBA_ValueDef::_downcast ( return 0; } -void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -8230,9 +8230,9 @@ const char* POA_CORBA_ValueDef::_interface_repository_id (void) const } CORBA_ValueDef* -POA_CORBA_ValueDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -8401,31 +8401,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA_IDLType_ptr result); @@ -8443,44 +8443,44 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequest TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueBoxDef *tao_impl - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 0; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -8492,7 +8492,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -8502,10 +8502,10 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } void @@ -8523,31 +8523,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl , CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -8566,7 +8566,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ValueBoxDef *tao_impl, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -8574,12 +8574,12 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the argument list on demand. Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -8595,25 +8595,25 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_EN } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the exception list on demand. Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Generate the result on demand. CORBA::Boolean tk_void_any = 1; CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); + TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -8621,7 +8621,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_S char * TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -8631,10 +8631,10 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_deriv CORBA::Boolean TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_is_a ( const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); + return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -8667,17 +8667,17 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Strateg _TAO_CORBA_ValueBoxDef_Proxy_Impl& _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ValueBoxDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); + this->create_proxy (strategy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -8687,7 +8687,7 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -8757,7 +8757,7 @@ _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8773,7 +8773,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( _collocated_tao_target_->_object_key (), "original_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -8782,14 +8782,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( "IDL:omg.org/CORBA/ValueBoxDef:1.0" ) )->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8803,7 +8803,7 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( _collocated_tao_target_->_object_key (), "original_type_def", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -8813,7 +8813,7 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( ) )->original_type_def ( original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -8846,7 +8846,7 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueBoxDef *_tao_impl = @@ -8867,18 +8867,18 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( _tao_server_request, _tao_upcall, _tao_impl - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8887,7 +8887,7 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8895,12 +8895,12 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -8928,7 +8928,7 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -8957,25 +8957,25 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( _tao_upcall, _tao_impl, original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->original_type_def ( original_type_def.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -8983,12 +8983,12 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -9009,7 +9009,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -9019,7 +9019,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9032,11 +9032,11 @@ void POA_CORBA_ValueBoxDef::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9049,7 +9049,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference; @@ -9068,7 +9068,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -9095,10 +9095,10 @@ void POA_CORBA_ValueBoxDef::_interface_skel ( CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a ( const char* value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -9132,12 +9132,12 @@ void* POA_CORBA_ValueBoxDef::_downcast ( return 0; } -void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -9147,9 +9147,9 @@ const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const } CORBA_ValueBoxDef* -POA_CORBA_ValueBoxDef::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h index 44ebf1426b3..722fd223576 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h @@ -65,7 +65,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -76,37 +76,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_FixedDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::UShort digits ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -116,12 +116,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -131,11 +131,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Short scale ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -145,12 +145,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void scale ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -160,28 +160,28 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -201,7 +201,7 @@ public: virtual ::_TAO_CORBA_FixedDef_Proxy_Impl &select_proxy ( ::CORBA_FixedDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -210,7 +210,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -253,7 +253,7 @@ public: virtual CORBA::UShort digits ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -262,7 +262,7 @@ public: virtual void digits ( CORBA_Object *_collocated_tao_target_, CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -270,7 +270,7 @@ public: virtual CORBA::Short scale ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -279,7 +279,7 @@ public: virtual void scale ( CORBA_Object *_collocated_tao_target_, CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -311,7 +311,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -322,37 +322,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ValueMemberDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -362,11 +362,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -376,12 +376,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -391,11 +391,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Visibility access ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -405,12 +405,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void access ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -420,98 +420,98 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -531,7 +531,7 @@ public: virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy ( ::CORBA_ValueMemberDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -540,7 +540,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -583,7 +583,7 @@ public: virtual CORBA::TypeCode_ptr type ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -591,7 +591,7 @@ public: virtual CORBA_IDLType_ptr type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -600,7 +600,7 @@ public: virtual void type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -608,7 +608,7 @@ public: virtual CORBA::Visibility access ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -617,7 +617,7 @@ public: virtual void access ( CORBA_Object *_collocated_tao_target_, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -649,7 +649,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -660,37 +660,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ValueDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -700,12 +700,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -715,11 +715,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_InitializerSeq * initializers ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -729,12 +729,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -744,11 +744,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef_ptr base_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -758,12 +758,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -773,11 +773,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDefSeq * abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -787,12 +787,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -802,11 +802,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_abstract ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -816,12 +816,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -831,11 +831,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_custom ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -845,12 +845,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -860,11 +860,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -874,12 +874,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -889,12 +889,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Boolean is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -904,11 +904,11 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueDef::FullValueDescription * describe_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -918,7 +918,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_ValueMemberDef_ptr create_value_member ( @@ -927,7 +927,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -937,7 +937,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_AttributeDef_ptr create_attribute ( @@ -946,7 +946,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -956,7 +956,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA_OperationDef_ptr create_operation ( @@ -968,7 +968,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -978,224 +978,224 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1215,7 +1215,7 @@ public: virtual ::_TAO_CORBA_ValueDef_Proxy_Impl &select_proxy ( ::CORBA_ValueDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1224,7 +1224,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1269,7 +1269,7 @@ public: virtual CORBA_InterfaceDefSeq * supported_interfaces ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1278,7 +1278,7 @@ public: virtual void supported_interfaces ( CORBA_Object *_collocated_tao_target_, const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1286,7 +1286,7 @@ public: virtual CORBA_InitializerSeq * initializers ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1295,7 +1295,7 @@ public: virtual void initializers ( CORBA_Object *_collocated_tao_target_, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1303,7 +1303,7 @@ public: virtual CORBA_ValueDef_ptr base_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1312,7 +1312,7 @@ public: virtual void base_value ( CORBA_Object *_collocated_tao_target_, CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1320,7 +1320,7 @@ public: virtual CORBA_ValueDefSeq * abstract_base_values ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1329,7 +1329,7 @@ public: virtual void abstract_base_values ( CORBA_Object *_collocated_tao_target_, const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1337,7 +1337,7 @@ public: virtual CORBA::Boolean is_abstract ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1346,7 +1346,7 @@ public: virtual void is_abstract ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1354,7 +1354,7 @@ public: virtual CORBA::Boolean is_custom ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1363,7 +1363,7 @@ public: virtual void is_custom ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1371,7 +1371,7 @@ public: virtual CORBA::Boolean is_truncatable ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1380,7 +1380,7 @@ public: virtual void is_truncatable ( CORBA_Object *_collocated_tao_target_, CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1389,7 +1389,7 @@ public: virtual CORBA::Boolean is_a ( CORBA_Object *_collocated_tao_target_, const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1397,7 +1397,7 @@ public: virtual CORBA_ValueDef::FullValueDescription * describe_value ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1410,7 +1410,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1423,7 +1423,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1439,7 +1439,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1471,7 +1471,7 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void* _downcast ( @@ -1482,37 +1482,37 @@ public: TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _non_existent_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _interface_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); ::CORBA_ValueBoxDef *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1522,12 +1522,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1537,105 +1537,105 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); static void _get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void _get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static void destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -1655,7 +1655,7 @@ public: virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy ( ::CORBA_ValueBoxDef *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1664,7 +1664,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1707,7 +1707,7 @@ public: virtual CORBA_IDLType_ptr original_type_def ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1716,7 +1716,7 @@ public: virtual void original_type_def ( CORBA_Object *_collocated_tao_target_, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i index 103672775f1..7248973257f 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i @@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_FixedDef_ptr) obj; @@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj; @@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_FixedDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj; @@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_FixedDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj; @@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::lookup_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_ValueDef::lookup_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_ValueDef::contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -316,14 +316,14 @@ ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_module_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -331,14 +331,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_module_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -346,14 +346,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -361,14 +361,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_union_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -376,14 +376,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_union_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -391,14 +391,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -406,14 +406,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -421,14 +421,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_value_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -436,14 +436,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_value_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -451,14 +451,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -466,14 +466,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_native_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -481,14 +481,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_native_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -496,14 +496,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -511,14 +511,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel ( req, (POA_CORBA_Container_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -526,14 +526,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -541,14 +541,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -556,14 +556,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -571,14 +571,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -586,14 +586,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -601,14 +601,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -616,14 +616,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -631,14 +631,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -646,14 +646,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -661,14 +661,14 @@ ACE_INLINE void POA_CORBA_ValueDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -676,14 +676,14 @@ ACE_INLINE void POA_CORBA_ValueDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -691,14 +691,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -706,14 +706,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj; @@ -721,14 +721,14 @@ ACE_INLINE void POA_CORBA_ValueDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -736,14 +736,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -751,14 +751,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -766,14 +766,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -781,14 +781,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -796,14 +796,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -811,14 +811,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -826,14 +826,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -841,14 +841,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -856,14 +856,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -871,14 +871,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -886,14 +886,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel ( req, (POA_CORBA_Contained_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -901,14 +901,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel ( req, (POA_CORBA_IDLType_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -916,14 +916,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel ( TAO_ServerRequest &req, void *obj, void *context - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj; @@ -931,6 +931,6 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel ( req, (POA_CORBA_IRObject_ptr) impl, context - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h index 9d4328f4b01..0fd833515c9 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h @@ -67,10 +67,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::UShort digits ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -78,14 +78,14 @@ public: void digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Short scale ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -93,28 +93,28 @@ public: void scale ( CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -160,17 +160,17 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -178,14 +178,14 @@ public: void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Visibility access ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -193,14 +193,14 @@ public: void access ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -208,14 +208,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -223,14 +223,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -238,35 +238,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -276,21 +276,21 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -336,10 +336,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_InterfaceDefSeq * supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -347,14 +347,14 @@ public: void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_InitializerSeq * initializers ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -362,14 +362,14 @@ public: void initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef_ptr base_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -377,14 +377,14 @@ public: void base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDefSeq * abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -392,14 +392,14 @@ public: void abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_abstract ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -407,14 +407,14 @@ public: void is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_custom ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -422,14 +422,14 @@ public: void is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Boolean is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -437,7 +437,7 @@ public: void is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -445,14 +445,14 @@ public: CORBA::Boolean is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_ValueDef::FullValueDescription * describe_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -464,7 +464,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -476,7 +476,7 @@ public: const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -491,7 +491,7 @@ public: const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -499,7 +499,7 @@ public: CORBA_Contained_ptr lookup ( const char * search_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -508,7 +508,7 @@ public: CORBA_ContainedSeq * contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -519,7 +519,7 @@ public: CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -529,7 +529,7 @@ public: CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -539,7 +539,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -551,7 +551,7 @@ public: const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -562,7 +562,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -574,7 +574,7 @@ public: const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -585,7 +585,7 @@ public: const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -596,7 +596,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -607,7 +607,7 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -624,7 +624,7 @@ public: const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -635,7 +635,7 @@ public: const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -646,7 +646,7 @@ public: const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -656,7 +656,7 @@ public: const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -667,7 +667,7 @@ public: const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -678,14 +678,14 @@ public: const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -693,14 +693,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -708,14 +708,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -723,35 +723,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -761,28 +761,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -828,10 +828,10 @@ public: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -839,14 +839,14 @@ public: void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -854,14 +854,14 @@ public: void id ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -869,14 +869,14 @@ public: void name ( const char * name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * version ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -884,35 +884,35 @@ public: void version ( const char * version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Container_ptr defined_in ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); char * absolute_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Repository_ptr containing_repository ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA_Contained::Description * describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -922,28 +922,28 @@ public: CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i index 29831f87b03..362bd1e0da5 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i @@ -90,31 +90,31 @@ POA_CORBA_FixedDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_FixedDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_FixedDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_FixedDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_FixedDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::UShort POA_CORBA_FixedDef_tie<T>::digits ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->digits ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_FixedDef_tie<T>::digits ( CORBA::UShort digits - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -122,27 +122,27 @@ void POA_CORBA_FixedDef_tie<T>::digits ( { this->ptr_->digits ( digits - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Short POA_CORBA_FixedDef_tie<T>::scale ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->scale ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_FixedDef_tie<T>::scale ( CORBA::Short scale - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -150,46 +150,46 @@ void POA_CORBA_FixedDef_tie<T>::scale ( { this->ptr_->scale ( scale - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_FixedDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_FixedDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_FixedDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -262,44 +262,44 @@ POA_CORBA_ValueMemberDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ValueMemberDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueMemberDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ValueMemberDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ValueMemberDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ValueMemberDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_ValueMemberDef_tie<T>::type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueMemberDef_tie<T>::type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -307,27 +307,27 @@ void POA_CORBA_ValueMemberDef_tie<T>::type_def ( { this->ptr_->type_def ( type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Visibility POA_CORBA_ValueMemberDef_tie<T>::access ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->access ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueMemberDef_tie<T>::access ( CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -335,27 +335,27 @@ void POA_CORBA_ValueMemberDef_tie<T>::access ( { this->ptr_->access ( access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueMemberDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueMemberDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -363,27 +363,27 @@ void POA_CORBA_ValueMemberDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueMemberDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueMemberDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -391,27 +391,27 @@ void POA_CORBA_ValueMemberDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueMemberDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueMemberDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -419,59 +419,59 @@ void POA_CORBA_ValueMemberDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_ValueMemberDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueMemberDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_ValueMemberDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_ValueMemberDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -480,7 +480,7 @@ void POA_CORBA_ValueMemberDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -490,33 +490,33 @@ void POA_CORBA_ValueMemberDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_ValueMemberDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueMemberDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -589,31 +589,31 @@ POA_CORBA_ValueDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ValueDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ValueDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_InterfaceDefSeq * POA_CORBA_ValueDef_tie<T>::supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->supported_interfaces ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -621,27 +621,27 @@ void POA_CORBA_ValueDef_tie<T>::supported_interfaces ( { this->ptr_->supported_interfaces ( supported_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_InitializerSeq * POA_CORBA_ValueDef_tie<T>::initializers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->initializers ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -649,27 +649,27 @@ void POA_CORBA_ValueDef_tie<T>::initializers ( { this->ptr_->initializers ( initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::base_value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->base_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -677,27 +677,27 @@ void POA_CORBA_ValueDef_tie<T>::base_value ( { this->ptr_->base_value ( base_value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ValueDefSeq * POA_CORBA_ValueDef_tie<T>::abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->abstract_base_values ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -705,27 +705,27 @@ void POA_CORBA_ValueDef_tie<T>::abstract_base_values ( { this->ptr_->abstract_base_values ( abstract_base_values - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_abstract ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_abstract ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -733,27 +733,27 @@ void POA_CORBA_ValueDef_tie<T>::is_abstract ( { this->ptr_->is_abstract ( is_abstract - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_custom ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_custom ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -761,27 +761,27 @@ void POA_CORBA_ValueDef_tie<T>::is_custom ( { this->ptr_->is_custom ( is_custom - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->is_truncatable ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -789,14 +789,14 @@ void POA_CORBA_ValueDef_tie<T>::is_truncatable ( { this->ptr_->is_truncatable ( is_truncatable - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_a ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -804,20 +804,20 @@ CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_a ( { return this->ptr_->is_a ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_ValueDef::FullValueDescription * POA_CORBA_ValueDef_tie<T>::describe_value ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe_value ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -828,7 +828,7 @@ CORBA_ValueMemberDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_member ( const char * version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -840,7 +840,7 @@ id, version, type, access - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -851,7 +851,7 @@ CORBA_AttributeDef_ptr POA_CORBA_ValueDef_tie<T>::create_attribute ( const char * version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -863,7 +863,7 @@ id, version, type, mode - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -877,7 +877,7 @@ CORBA_OperationDef_ptr POA_CORBA_ValueDef_tie<T>::create_operation ( const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, const CORBA_ContextIdSeq & contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -892,14 +892,14 @@ id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained_ptr POA_CORBA_ValueDef_tie<T>::lookup ( const char * search_name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -907,7 +907,7 @@ CORBA_Contained_ptr POA_CORBA_ValueDef_tie<T>::lookup ( { return this->ptr_->lookup ( search_name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -915,7 +915,7 @@ template <class T> ACE_INLINE CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents ( CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -924,7 +924,7 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents ( return this->ptr_->contents ( limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -934,7 +934,7 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::lookup_name ( CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -945,7 +945,7 @@ search_name, levels_to_search, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -954,7 +954,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, CORBA::Long max_returned_objs - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -964,7 +964,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents limit_type, exclude_inherited, max_returned_objs - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -973,7 +973,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -983,7 +983,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -994,7 +994,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ValueDef_tie<T>::create_constant ( const char * version, CORBA_IDLType_ptr type, const CORBA::Any & value - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1006,7 +1006,7 @@ id, version, type, value - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1016,7 +1016,7 @@ CORBA_StructDef_ptr POA_CORBA_ValueDef_tie<T>::create_struct ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1027,7 +1027,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1038,7 +1038,7 @@ CORBA_UnionDef_ptr POA_CORBA_ValueDef_tie<T>::create_union ( const char * version, CORBA_IDLType_ptr discriminator_type, const CORBA_UnionMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1050,7 +1050,7 @@ id, version, discriminator_type, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1060,7 +1060,7 @@ CORBA_EnumDef_ptr POA_CORBA_ValueDef_tie<T>::create_enum ( const char * name, const char * version, const CORBA_EnumMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1071,7 +1071,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1081,7 +1081,7 @@ CORBA_AliasDef_ptr POA_CORBA_ValueDef_tie<T>::create_alias ( const char * name, const char * version, CORBA_IDLType_ptr original_type - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1092,7 +1092,7 @@ id, name, version, original_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1102,7 +1102,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1113,7 +1113,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1129,7 +1129,7 @@ CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::create_value ( const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1146,7 +1146,7 @@ id, abstract_base_values, supported_interfaces, initializers - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1156,7 +1156,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_box ( const char * name, const char * version, CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1167,7 +1167,7 @@ id, name, version, original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1177,7 +1177,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ValueDef_tie<T>::create_exception ( const char * name, const char * version, const CORBA_StructMemberSeq & members - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1188,7 +1188,7 @@ id, name, version, members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1197,7 +1197,7 @@ CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native ( const char * id, const char * name, const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1207,7 +1207,7 @@ CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native ( id, name, version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1217,7 +1217,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_abstract_interf const char * name, const char * version, const CORBA_AbstractInterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1228,7 +1228,7 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1238,7 +1238,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_local_interface ( const char * name, const char * version, const CORBA_InterfaceDefSeq & base_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1249,27 +1249,27 @@ id, name, version, base_interfaces - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1277,27 +1277,27 @@ void POA_CORBA_ValueDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1305,27 +1305,27 @@ void POA_CORBA_ValueDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1333,59 +1333,59 @@ void POA_CORBA_ValueDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_ValueDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_ValueDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_ValueDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1394,7 +1394,7 @@ void POA_CORBA_ValueDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1404,46 +1404,46 @@ void POA_CORBA_ValueDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ValueDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_ValueDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1516,31 +1516,31 @@ POA_CORBA_ValueBoxDef_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_ValueBoxDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ValueBoxDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->poa_.in ())) return PortableServer::POA::_duplicate (this->poa_.in ()); - return this->POA_CORBA_ValueBoxDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_ValueBoxDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA_IDLType_ptr POA_CORBA_ValueBoxDef_tie<T>::original_type_def ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->original_type_def ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueBoxDef_tie<T>::original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1548,27 +1548,27 @@ void POA_CORBA_ValueBoxDef_tie<T>::original_type_def ( { this->ptr_->original_type_def ( original_type_def - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueBoxDef_tie<T>::id ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->id ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueBoxDef_tie<T>::id ( const char * id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1576,27 +1576,27 @@ void POA_CORBA_ValueBoxDef_tie<T>::id ( { this->ptr_->id ( id - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueBoxDef_tie<T>::name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueBoxDef_tie<T>::name ( const char * name - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1604,27 +1604,27 @@ void POA_CORBA_ValueBoxDef_tie<T>::name ( { this->ptr_->name ( name - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueBoxDef_tie<T>::version ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->version ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueBoxDef_tie<T>::version ( const char * version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1632,59 +1632,59 @@ void POA_CORBA_ValueBoxDef_tie<T>::version ( { this->ptr_->version ( version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Container_ptr POA_CORBA_ValueBoxDef_tie<T>::defined_in ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->defined_in ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE char * POA_CORBA_ValueBoxDef_tie<T>::absolute_name ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->absolute_name ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Repository_ptr POA_CORBA_ValueBoxDef_tie<T>::containing_repository ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->containing_repository ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA_Contained::Description * POA_CORBA_ValueBoxDef_tie<T>::describe ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->describe ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -1693,7 +1693,7 @@ void POA_CORBA_ValueBoxDef_tie<T>::move ( CORBA_Container_ptr new_container, const char * new_name, const char * new_version - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1703,46 +1703,46 @@ void POA_CORBA_ValueBoxDef_tie<T>::move ( new_container, new_name, new_version - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::TypeCode_ptr POA_CORBA_ValueBoxDef_tie<T>::type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::DefinitionKind POA_CORBA_ValueBoxDef_tie<T>::def_kind ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->def_kind ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_ValueBoxDef_tie<T>::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp index 51fbfd395fa..f9a463f4f71 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp @@ -12,10 +12,10 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "TAO Interface Repository\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int status = server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int status = server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) @@ -24,10 +24,10 @@ main (int argc, char *argv[]) } else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER); + status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (status == -1) diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index 045cad101bd..059b2abbd46 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -45,24 +45,24 @@ IFR_Service::~IFR_Service (void) int IFR_Service::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->root_poa_ = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int retval = OPTIONS::instance()->parse_args (argc, @@ -71,31 +71,31 @@ IFR_Service::init (int argc, if (retval != 0) return retval; - retval = this->create_poas (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->create_poas (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) return retval; - retval = this->open_config (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->open_config (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) return retval; - retval = this->create_repository (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->create_repository (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) return retval; - retval = this->create_locator (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->create_locator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) return retval; - retval = this->init_multicast_server (TAO_ENV_SINGLE_ARG_PARAMETER); + retval = this->init_multicast_server (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) @@ -118,22 +118,22 @@ IFR_Service::init (int argc, } int -IFR_Service::run (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::run (ACE_ENV_SINGLE_ARG_DECL) { - this->orb_->run (0 TAO_ENV_ARG_PARAMETER); + this->orb_->run (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -IFR_Service::fini (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::fini (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { this->root_poa_->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -148,13 +148,13 @@ IFR_Service::fini (TAO_ENV_SINGLE_ARG_DECL) } int -IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::create_poas (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::PolicyList policies (4); @@ -163,7 +163,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) // So the Repository's POA can survive a crash. policies[0] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_TString repo_name = "repoPOA"; @@ -172,7 +172,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) this->root_poa_->create_POA (repo_name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); policies.length (4); @@ -181,7 +181,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) policies[1] = this->root_poa_->create_id_assignment_policy ( PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (-1); @@ -189,7 +189,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) policies[2] = this->root_poa_->create_request_processing_policy ( PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (-1); @@ -197,7 +197,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) policies[3] = this->root_poa_->create_servant_retention_policy ( PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (-1); @@ -207,7 +207,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) this->root_poa_->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Destroy the policy objects as they have been passed to @@ -217,7 +217,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < length; ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -225,7 +225,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL) } int -IFR_Service::create_locator (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::create_locator (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->servant_locator_impl_, IFR_ServantLocator (this->repo_impl_), @@ -233,14 +233,14 @@ IFR_Service::create_locator (TAO_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (-1); this->ir_object_poa_->set_servant_manager (this->servant_locator_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -IFR_Service::open_config (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::open_config (ACE_ENV_SINGLE_ARG_DECL) { if (OPTIONS::instance ()->using_registry ()) { @@ -294,7 +294,7 @@ IFR_Service::open_config (TAO_ENV_SINGLE_ARG_DECL) } int -IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::create_repository (ACE_ENV_SINGLE_ARG_DECL) { TAO_ComponentRepository_i *impl = 0; ACE_NEW_THROW_EX ( @@ -329,10 +329,10 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var repo_oid = this->repo_poa_->activate_object (impl_tie - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->repository_ = impl_tie->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->repository_ = impl_tie->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -341,16 +341,16 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) // Save and output the IOR string. this->ifr_ior_ = this->orb_->object_to_string (this->repository_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (adapter.in ())) { @@ -360,7 +360,7 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) { adapter->bind ("InterfaceRepository", this->ifr_ior_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -379,7 +379,7 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL) // Install ior multicast handler. int -IFR_Service::init_multicast_server (TAO_ENV_SINGLE_ARG_DECL) +IFR_Service::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL) { // Get reactor instance from TAO. ACE_Reactor *reactor = this->orb_->orb_core ()->reactor (); diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index c73abc1c595..2df674784d1 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -46,29 +46,29 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the IFR service. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the IFR service. - int fini (TAO_ENV_SINGLE_ARG_DECL); + int fini (ACE_ENV_SINGLE_ARG_DECL); // Shut down the IFR service. protected: - int create_poas (TAO_ENV_SINGLE_ARG_DECL); + int create_poas (ACE_ENV_SINGLE_ARG_DECL); // Two persistent POAs, one using a servant locator. - int create_locator (TAO_ENV_SINGLE_ARG_DECL); + int create_locator (ACE_ENV_SINGLE_ARG_DECL); // Create a servant locator and register it with its POA. - int open_config (TAO_ENV_SINGLE_ARG_DECL); + int open_config (ACE_ENV_SINGLE_ARG_DECL); // Open an ACE_Configuration of the appropriate type. - int create_repository (TAO_ENV_SINGLE_ARG_DECL); + int create_repository (ACE_ENV_SINGLE_ARG_DECL); // Create and initialize the repository. - int init_multicast_server (TAO_ENV_SINGLE_ARG_DECL); + int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL); // Enable the Interface Repository to answer multicast requests // for its IOR. diff --git a/TAO/orbsvcs/IFR_Service/IRObject_i.h b/TAO/orbsvcs/IFR_Service/IRObject_i.h index 315b1a508e6..45ade535476 100644 --- a/TAO/orbsvcs/IFR_Service/IRObject_i.h +++ b/TAO/orbsvcs/IFR_Service/IRObject_i.h @@ -53,19 +53,19 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Pure virtual- the unlocked version called by destroy() wrapper. diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp index 0bab296d146..af7eceb62cc 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp @@ -25,53 +25,53 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void) } CORBA::DefinitionKind -TAO_InterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_InterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Interface; } void -TAO_InterfaceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_InterfaceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // This will get rid of the repo ids, which Contained_i::destroy()'s // call to remove_section (recursive = 1) will not get, and also // destroy the attribute's anonymous type, if any. - this->destroy_special ("attrs" TAO_ENV_ARG_PARAMETER); + this->destroy_special ("attrs" ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->destroy_special ("ops" TAO_ENV_ARG_PARAMETER); + this->destroy_special ("ops" ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA_Contained::Description * -TAO_InterfaceDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -82,15 +82,15 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_InterfaceDescription ifd; - ifd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ifd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - ifd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ifd.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -101,11 +101,11 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) ifd.defined_in = container_id.c_str (); - ifd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ifd.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong i = 0; - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); @@ -122,7 +122,7 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) { oid = this->repo_->ir_poa ()->reference_to_id (bases[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); base_path = @@ -136,7 +136,7 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) TAO_InterfaceDef_i impl (this->repo_, base_key); - repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -148,16 +148,16 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_InterfaceDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_InterfaceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -174,20 +174,20 @@ TAO_InterfaceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) return this->repo_->tc_factory ()->create_interface_tc (id.c_str (), name.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_InterfaceDefSeq * -TAO_InterfaceDef_i::base_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::base_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDefSeq * -TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; @@ -219,12 +219,12 @@ TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL) this->repo_->servant_factory ()->create_objref ( def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); retval[i] = CORBA_InterfaceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -233,23 +233,23 @@ TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->base_interfaces_i (base_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // If we are an abstract interface, all our base interfaces must be // abstract as well. - CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (def_kind == CORBA::dk_AbstractInterface) @@ -258,7 +258,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa for (CORBA::ULong i = 0; i < length; ++i) { - def_kind = base_interfaces[i]->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + def_kind = base_interfaces[i]->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (def_kind != CORBA::dk_AbstractInterface) @@ -291,7 +291,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa { oid = this->repo_->ir_poa ()->reference_to_id (base_interfaces[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; inherited_path = @@ -305,7 +305,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa TAO_InterfaceDef_i impl (this->repo_, base_key); - name = impl.name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + name = impl.name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // None of these names can clash with any we may already have. @@ -322,18 +322,18 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa CORBA::Boolean TAO_InterfaceDef_i::is_a (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_InterfaceDef_i::is_a_i (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0) @@ -341,7 +341,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id return 1; } - CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Is it our type? @@ -349,7 +349,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id return 1; // Is it one of our ancestors' types? - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); @@ -362,7 +362,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id { oid = this->repo_->ir_poa ()->reference_to_id (bases[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); base_path = @@ -377,7 +377,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id base_key); CORBA::Boolean success = impl.is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (success == 1) @@ -388,16 +388,16 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id } CORBA_InterfaceDef::FullInterfaceDescription * -TAO_InterfaceDef_i::describe_interface (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::describe_interface (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_interface_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_interface_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDef::FullInterfaceDescription * -TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_InterfaceDef::FullInterfaceDescription *fifd = 0; @@ -407,10 +407,10 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_InterfaceDef::FullInterfaceDescription_var retval = fifd; - fifd->name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - fifd->id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -421,7 +421,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) fifd->defined_in = container_id.c_str (); - fifd->version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong i = 0; @@ -472,7 +472,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) TAO_OperationDef_i op (this->repo_, key); - fifd->operations[i] = op.make_description (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->operations[i] = op.make_description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -520,11 +520,11 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) TAO_AttributeDef_i attr (this->repo_, key); - fifd->attributes[i] = attr.make_description (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->attributes[i] = attr.make_description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } - CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong length = bases->length (); @@ -541,7 +541,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) { oid = this->repo_->ir_poa ()->reference_to_id (bases[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); base_path = @@ -555,13 +555,13 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL) TAO_InterfaceDef_i impl (this->repo_, base_key); - repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } fifd->base_interfaces = repo_ids; - fifd->type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + fifd->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval._retn (); @@ -574,7 +574,7 @@ TAO_InterfaceDef_i::create_attribute ( const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -585,7 +585,7 @@ TAO_InterfaceDef_i::create_attribute ( version, type, mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AttributeDef_ptr @@ -595,20 +595,20 @@ TAO_InterfaceDef_i::create_attribute_i ( const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); if (bad_params) return CORBA_AttributeDef::_nil (); bad_params = this->check_inherited_attrs (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); if (bad_params) @@ -636,7 +636,7 @@ TAO_InterfaceDef_i::create_attribute_i ( // Store the path to the attribute's type definition. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); CORBA::String_var type_path = @@ -657,7 +657,7 @@ TAO_InterfaceDef_i::create_attribute_i ( version, type, mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ()); #if 0 // CCM specific. @@ -681,7 +681,7 @@ TAO_InterfaceDef_i::create_attribute_i ( { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (get_exceptions[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); @@ -713,7 +713,7 @@ TAO_InterfaceDef_i::create_attribute_i ( { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (put_exceptions[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); @@ -734,12 +734,12 @@ TAO_InterfaceDef_i::create_attribute_i ( CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Attribute, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); CORBA_AttributeDef_var retval = CORBA_AttributeDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ()); return retval._retn (); @@ -754,7 +754,7 @@ TAO_InterfaceDef_i::create_operation (const char *id, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_OperationDef::_nil ()); @@ -767,7 +767,7 @@ TAO_InterfaceDef_i::create_operation (const char *id, params, exceptions, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_OperationDef_ptr @@ -779,12 +779,12 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean bad_params = this->pre_exist (id, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); if (bad_params) @@ -811,9 +811,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, "ops\\", CORBA::dk_Operation); - CORBA::TypeCode_var rettype = result->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var rettype = result->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); - CORBA::TCKind kind = rettype->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = rettype->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); // Oneway operations cannot have a non-void return type. @@ -827,7 +827,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, // Get the path to our return type and store it. PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (result - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); CORBA::String_var result_path = @@ -883,7 +883,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, params[i].name.in ()); PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); @@ -924,7 +924,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (exceptions[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); @@ -965,12 +965,12 @@ TAO_InterfaceDef_i::create_operation_i (const char *id, CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (CORBA::dk_Operation, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); CORBA_OperationDef_var retval = CORBA_OperationDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_OperationDef::_nil ()); return retval._retn (); @@ -982,7 +982,7 @@ TAO_InterfaceDef_i::interface_contents ( ACE_Unbounded_Queue<ACE_TString> &path_queue, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -1083,7 +1083,7 @@ TAO_InterfaceDef_i::interface_contents ( path_queue, limit_type, exclude_inherited - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -1091,7 +1091,7 @@ TAO_InterfaceDef_i::interface_contents ( void TAO_InterfaceDef_i::destroy_special (const char *sub_section - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key sub_key; @@ -1118,7 +1118,7 @@ TAO_InterfaceDef_i::destroy_special (const char *sub_section TAO_AttributeDef_i attr (this->repo_, member_key); - attr.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + attr.destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -1126,7 +1126,7 @@ TAO_InterfaceDef_i::destroy_special (const char *sub_section TAO_OperationDef_i op (this->repo_, member_key); - op.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + op.destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -1139,7 +1139,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_CString the_get_name ("_get_"); @@ -1167,7 +1167,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, params, excepts, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (mode == CORBA::ATTR_NORMAL) @@ -1180,7 +1180,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, CORBA_PrimitiveDef_var rettype = this->repo_->get_primitive (CORBA::pk_void - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; params.length (1); @@ -1199,7 +1199,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id, params, excepts, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -1365,7 +1365,7 @@ TAO_InterfaceDef_i::inherited_operations ( CORBA::Boolean TAO_InterfaceDef_i::check_inherited_attrs (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h index 88a237df5ad..28b0e3fd3cc 100644 --- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h @@ -54,87 +54,87 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_InterfaceDefSeq *base_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDefSeq *base_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void base_interfaces ( const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void base_interfaces_i ( const CORBA_InterfaceDefSeq &base_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_a ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_InterfaceDef::FullInterfaceDescription *describe_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDef::FullInterfaceDescription *describe_interface_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -144,7 +144,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -154,7 +154,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -167,7 +167,7 @@ public: const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -180,7 +180,7 @@ public: const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -189,7 +189,7 @@ public: ACE_Unbounded_Queue<ACE_TString> &path_queue, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Gathers the attributes and operations of all the ancestors. @@ -197,7 +197,7 @@ public: private: void destroy_special ( const char *sub_section - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Removed the repo ids of our attributes and operations from @@ -208,7 +208,7 @@ private: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Create set and/or get operations for an attribute. @@ -232,7 +232,7 @@ private: // operations. CORBA::Boolean check_inherited_attrs (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // When creating a new attribute, check for a clash with an inherited // attribute name. diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp index 06c9d510374..8443fc29d69 100644 --- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp @@ -23,7 +23,7 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void) } CORBA::DefinitionKind -TAO_LocalInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_LocalInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_LocalInterface; @@ -31,18 +31,18 @@ TAO_LocalInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_LocalInterfaceDef_i::is_a (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0) @@ -51,5 +51,5 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id } return this->TAO_InterfaceDef_i::is_a_i (interface_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h index 9c99c164af3..c4a9e3851b2 100644 --- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h @@ -50,20 +50,20 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::Boolean is_a ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *interface_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp index 81063de075e..9b3097ec619 100644 --- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp @@ -19,45 +19,45 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void) } CORBA::DefinitionKind -TAO_ModuleDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ModuleDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Module; } -void -TAO_ModuleDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_ModuleDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_ModuleDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_ModuleDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA_Contained::Description * -TAO_ModuleDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ModuleDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -68,15 +68,15 @@ TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_ModuleDescription md; - md.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + md.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - md.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + md.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -87,7 +87,7 @@ TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) md.defined_in = container_id.c_str (); - md.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + md.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= md; diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h index d6f1c902c12..5b233dd642d 100644 --- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h @@ -34,7 +34,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_ModuleDef_i : public virtual TAO_Container_i, +class TAO_ModuleDef_i : public virtual TAO_Container_i, public virtual TAO_Contained_i { // = TITLE @@ -52,31 +52,31 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp index 458f8b216c1..366530bfa56 100644 --- a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp @@ -20,23 +20,23 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void) } CORBA::DefinitionKind -TAO_NativeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_NativeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Native; } CORBA::TypeCode_ptr -TAO_NativeDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_NativeDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_NativeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -51,6 +51,6 @@ TAO_NativeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) return this->repo_->tc_factory ()->create_native_tc (id.c_str (), name.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.h b/TAO/orbsvcs/IFR_Service/NativeDef_i.h index b3e758f97ac..1f5000782ac 100644 --- a/TAO/orbsvcs/IFR_Service/NativeDef_i.h +++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.h @@ -51,19 +51,19 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp index 93a972df3bb..f5cc22de14a 100644 --- a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp @@ -24,23 +24,23 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void) } CORBA::DefinitionKind -TAO_OperationDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_OperationDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Operation; } CORBA_Contained::Description * -TAO_OperationDef_i::describe (TAO_ENV_SINGLE_ARG_DECL ) +TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_OperationDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL ) +TAO_OperationDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -51,26 +51,26 @@ TAO_OperationDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL ) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->value <<= this->make_description (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval._retn (); } CORBA::TypeCode_ptr -TAO_OperationDef_i::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_OperationDef_i::result_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString result_path; @@ -86,25 +86,25 @@ TAO_OperationDef_i::result_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (result_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_OperationDef_i::result_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::result_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_OperationDef_i::result_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString result_path; @@ -129,32 +129,32 @@ TAO_OperationDef_i::result_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, result_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->result_def_i (result_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (result_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var result_path = @@ -166,16 +166,16 @@ TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def } CORBA_ParDescriptionSeq * -TAO_OperationDef_i::params (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::params (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ParDescriptionSeq * -TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong i = 0; @@ -258,12 +258,12 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (type_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr<TAO_IDLType_i> safety (impl); - retval[i].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + retval[i].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); u_int kind = 0; @@ -277,11 +277,11 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, type_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i].type_def = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -290,18 +290,18 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq ¶ms - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->params_i (params - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq ¶ms - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, @@ -338,7 +338,7 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq ¶ms params[i].name.in ()); PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var type_path = @@ -355,16 +355,16 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq ¶ms } CORBA::OperationMode -TAO_OperationDef_i::mode (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::mode (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL); - return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::OperationMode -TAO_OperationDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_OperationDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int mode; @@ -377,18 +377,18 @@ TAO_OperationDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_OperationDef_i::mode (CORBA::OperationMode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->mode_i (mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::mode_i (CORBA::OperationMode mode - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, @@ -397,16 +397,16 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode } CORBA_ContextIdSeq * -TAO_OperationDef_i::contexts (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::contexts (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ContextIdSeq * -TAO_OperationDef_i::contexts_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key contexts_key; @@ -462,18 +462,18 @@ TAO_OperationDef_i::contexts_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->contexts_i (contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, @@ -502,16 +502,16 @@ TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts } CORBA_ExceptionDefSeq * -TAO_OperationDef_i::exceptions (TAO_ENV_SINGLE_ARG_DECL ) +TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ExceptionDefSeq * -TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL ) +TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration_Section_Key excepts_key; @@ -592,11 +592,11 @@ TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL ) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[i] = CORBA_ExceptionDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -605,18 +605,18 @@ TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL ) void TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->exceptions_i (exceptions - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->remove_section (this->section_key_, @@ -638,7 +638,7 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (exceptions[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var type_path = @@ -655,15 +655,15 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions CORBA_OperationDescription TAO_OperationDef_i::make_description ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_OperationDescription od; - od.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - od.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); ACE_TString container_id; @@ -673,21 +673,21 @@ TAO_OperationDef_i::make_description ( od.defined_in = container_id.c_str (); - od.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - od.result = this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.result = this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - od.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); - CORBA_ContextIdSeq_var cid_seq = this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ContextIdSeq_var cid_seq = this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); od.contexts = cid_seq.in (); - CORBA_ParDescriptionSeq_var pd_seq = this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_ParDescriptionSeq_var pd_seq = this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); od.parameters = pd_seq.in (); @@ -771,7 +771,7 @@ TAO_OperationDef_i::make_description ( TAO_ExceptionDef_i impl (this->repo_, type_key); - od.exceptions[i].type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + od.exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (od); } } diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.h b/TAO/orbsvcs/IFR_Service/OperationDef_i.h index 165d3a23d39..e01332200fa 100644 --- a/TAO/orbsvcs/IFR_Service/OperationDef_i.h +++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.h @@ -51,145 +51,145 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr result_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr result_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr result_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void result_def ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result_def_i ( CORBA_IDLType_ptr result_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ParDescriptionSeq *params ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ParDescriptionSeq *params_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void params ( const CORBA_ParDescriptionSeq ¶ms - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void params_i ( const CORBA_ParDescriptionSeq ¶ms - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::OperationMode mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::OperationMode mode_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void mode ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void mode_i ( CORBA::OperationMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ContextIdSeq *contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ContextIdSeq *contexts_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void contexts ( const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void contexts_i ( const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ExceptionDefSeq *exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ExceptionDefSeq *exceptions_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void exceptions ( const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void exceptions_i ( const CORBA_ExceptionDefSeq &exceptions - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_OperationDescription make_description ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Common code for InterfaceDef to call in diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp index f293fdee802..e52de82784f 100644 --- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp @@ -20,39 +20,39 @@ TAO_PrimaryKeyDef_i::~TAO_PrimaryKeyDef_i (void) } CORBA::DefinitionKind -TAO_PrimaryKeyDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PrimaryKeyDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_PrimaryKey; } void -TAO_PrimaryKeyDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_PrimaryKeyDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_PrimaryKeyDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_PrimaryKeyDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_PrimaryKeyDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_PrimaryKeyDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_PrimaryKeyDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_PrimaryKeyDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -61,18 +61,18 @@ TAO_PrimaryKeyDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SIN CORBA::Boolean TAO_PrimaryKeyDef_i::is_a (const char *primary_key_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (primary_key_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -80,16 +80,16 @@ TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */ } CORBA_ValueDef_ptr -TAO_PrimaryKeyDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL) +TAO_PrimaryKeyDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); - return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDef_ptr -TAO_PrimaryKeyDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_PrimaryKeyDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h index 4c937962cf7..4e5dcaab2bc 100644 --- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h @@ -52,53 +52,53 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::Boolean is_a ( const char *primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *primary_key_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDef_ptr primary_key ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDef_ptr primary_key_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp index f6343693d55..6e200e14027 100644 --- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp @@ -20,37 +20,37 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void) } CORBA::DefinitionKind -TAO_PrimitiveDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PrimitiveDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Primitive; } -void -TAO_PrimitiveDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_PrimitiveDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_PrimitiveDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); } -CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +CORBA::TypeCode_ptr +TAO_PrimitiveDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::TypeCode_ptr +TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int pkind = 0; @@ -109,17 +109,17 @@ TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } } -CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind (TAO_ENV_SINGLE_ARG_DECL) +CORBA::PrimitiveKind +TAO_PrimitiveDef_i::kind (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null); - return this->kind_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->kind_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::PrimitiveKind +TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int pkind = 0; diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h index 93bd5663df3..d4cbe2f096c 100644 --- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h @@ -50,42 +50,42 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // May not be called on a primitive kind - raises BAD_INV_ORDER. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Must implement this here because it's pure virtual in the // base class. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PrimitiveKind kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::PrimitiveKind kind_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp index 67d87d93f3a..80e73290122 100644 --- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp @@ -20,56 +20,56 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void) } CORBA::DefinitionKind -TAO_ProvidesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ProvidesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Provides; } -void -TAO_ProvidesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_ProvidesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_ProvidesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_ProvidesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ProvidesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ProvidesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ProvidesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -CORBA_InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL) +CORBA_InterfaceDef_ptr +TAO_ProvidesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); - return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +CORBA_InterfaceDef_ptr +TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h index 519bb360a63..5cd1e50fcbc 100644 --- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h @@ -50,41 +50,41 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDef_ptr interface_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp index 3010f401007..044d7b67bf3 100644 --- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp @@ -21,39 +21,39 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void) } CORBA::DefinitionKind -TAO_PublishesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PublishesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Publishes; } -void -TAO_PublishesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_PublishesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_PublishesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_PublishesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_PublishesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_PublishesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_PublishesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_PublishesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h index 6e68f4b1f91..b33c970c958 100644 --- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h @@ -51,30 +51,30 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.cpp b/TAO/orbsvcs/IFR_Service/Repository_i.cpp index f0bddca277e..ffc9f68dac3 100644 --- a/TAO/orbsvcs/IFR_Service/Repository_i.cpp +++ b/TAO/orbsvcs/IFR_Service/Repository_i.cpp @@ -48,14 +48,14 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, // Resolve and narrow the TypeCodeFactory. CORBA::Object_var object = this->orb_->resolve_initial_references ("TypeCodeFactory" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (object.in ())) { this->tc_factory_ = CORBA::TypeCodeFactory::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->tc_factory_.in ())) @@ -215,14 +215,14 @@ TAO_Repository_i::~TAO_Repository_i (void) } CORBA::DefinitionKind -TAO_Repository_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Repository_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Repository; } void -TAO_Repository_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO)); @@ -230,18 +230,18 @@ TAO_Repository_i::destroy (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained_ptr TAO_Repository_i::lookup_id (const char *search_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_Contained::_nil ()); return this->lookup_id_i (search_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_Contained_ptr TAO_Repository_i::lookup_id_i (const char *search_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0 @@ -275,30 +275,30 @@ TAO_Repository_i::lookup_id_i (const char *search_id CORBA::Object_var obj = this->servant_factory_->create_objref (def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_Contained::_nil ()); return CORBA_Contained::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); return this->get_canonical_typecode_i (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); switch (kind) @@ -310,37 +310,37 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); case CORBA::tk_array: { - CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); CORBA::TypeCode_var canon_ctype = this->get_canonical_typecode_i (ctype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->tc_factory ()->create_array_tc (length, canon_ctype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } case CORBA::tk_sequence: { - CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); CORBA::TypeCode_var canon_ctype = this->get_canonical_typecode_i (ctype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->tc_factory ()->create_sequence_tc (length, canon_ctype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } case CORBA::tk_alias: case CORBA::tk_objref: @@ -355,7 +355,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc case CORBA::tk_component: case CORBA::tk_home: { - CORBA::String_var id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); ACE_TString path; @@ -381,18 +381,18 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc TAO_ExceptionDef_i impl (this, key); - return impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } else { TAO_IDLType_i *impl = this->servant_factory ()->create_idltype (key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } } } @@ -400,7 +400,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc CORBA_PrimitiveDef_ptr TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString obj_id ("pkinds\\"); @@ -410,27 +410,27 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_Primitive, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ()); return CORBA_PrimitiveDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StringDef_ptr TAO_Repository_i::create_string (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_StringDef::_nil ()); return this->create_string_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StringDef_ptr TAO_Repository_i::create_string_i (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; @@ -469,27 +469,27 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_String, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_StringDef::_nil ()); return CORBA_StringDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_WstringDef_ptr TAO_Repository_i::create_wstring (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_WstringDef::_nil ()); return this->create_wstring_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_WstringDef_ptr TAO_Repository_i::create_wstring_i (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int count = 0; @@ -528,35 +528,35 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_Wstring, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_WstringDef::_nil ()); return CORBA_WstringDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_SequenceDef_ptr TAO_Repository_i::create_sequence (CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_SequenceDef::_nil ()); return this->create_sequence_i (bound, element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_SequenceDef_ptr TAO_Repository_i::create_sequence_i (CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->ir_poa_->reference_to_id (element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ()); CORBA::String_var element_path = @@ -606,35 +606,35 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound, CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_Sequence, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ()); return CORBA_SequenceDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ArrayDef_ptr TAO_Repository_i::create_array (CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ArrayDef::_nil ()); return this->create_array_i (length, element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ArrayDef_ptr TAO_Repository_i::create_array_i (CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->ir_poa_->reference_to_id (element_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ()); CORBA::String_var element_path = @@ -684,30 +684,30 @@ TAO_Repository_i::create_array_i (CORBA::ULong length, CORBA::Object_var obj = this->servant_factory_->create_objref (CORBA::dk_Array, obj_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ()); return CORBA_ArrayDef::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_FixedDef_ptr TAO_Repository_i::create_fixed (CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_FixedDef::_nil ()); return this->create_fixed_i (digits, scale - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_FixedDef_ptr TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */, CORBA::Short /* scale */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA_FixedDef::_nil ()); diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.h b/TAO/orbsvcs/IFR_Service/Repository_i.h index 57afd79f4fc..647a0572d24 100644 --- a/TAO/orbsvcs/IFR_Service/Repository_i.h +++ b/TAO/orbsvcs/IFR_Service/Repository_i.h @@ -58,44 +58,44 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Accessor for the readonly attribute. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // May not be called on a repository - raises BAD_INV_ORDER. virtual CORBA_Contained_ptr lookup_id ( const char *search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_Contained_ptr lookup_id_i ( const char *search_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr get_canonical_typecode ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr get_canonical_typecode_i ( CORBA::TypeCode_ptr tc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PrimitiveDef_ptr get_primitive ( CORBA::PrimitiveKind kind - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // No locking necessary because the database is not @@ -103,67 +103,67 @@ public: virtual CORBA_StringDef_ptr create_string ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_StringDef_ptr create_string_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_WstringDef_ptr create_wstring ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_WstringDef_ptr create_wstring_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_SequenceDef_ptr create_sequence ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); CORBA_SequenceDef_ptr create_sequence_i ( CORBA::ULong bound, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); virtual CORBA_ArrayDef_ptr create_array ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ArrayDef_ptr create_array_i ( CORBA::ULong length, CORBA_IDLType_ptr element_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_FixedDef_ptr create_fixed ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_FixedDef_ptr create_fixed_i ( CORBA::UShort digits, CORBA::Short scale - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp index b60466363bc..e84948ad205 100644 --- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp @@ -22,27 +22,27 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void) } CORBA::DefinitionKind -TAO_SequenceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SequenceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Sequence; } void -TAO_SequenceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Only if it is (w)string, fixed, array or sequence. - this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TString name; @@ -56,43 +56,43 @@ TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_SequenceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::TypeCode_var element_typecode = - this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_sequence_tc ( bound, element_typecode.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::ULong -TAO_SequenceDef_i::bound (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::bound (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::ULong -TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int bound = 0; @@ -105,18 +105,18 @@ TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_SequenceDef_i::bound (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->bound_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_SequenceDef_i::bound_i (CORBA::ULong bound - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, @@ -125,16 +125,16 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound } CORBA::TypeCode_ptr -TAO_SequenceDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -150,25 +150,25 @@ TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_SequenceDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -193,35 +193,35 @@ TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, element_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->element_type_def_i (element_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (element_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var element_path = @@ -234,7 +234,7 @@ TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def void TAO_SequenceDef_i::destroy_element_type ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString element_path; @@ -269,12 +269,12 @@ TAO_SequenceDef_i::destroy_element_type ( { TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (element_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; auto_ptr<TAO_IDLType_i> safety (impl); - impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; break; diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h index 061e91adc6e..7ec49a80cad 100644 --- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h +++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h @@ -50,91 +50,91 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong bound_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void bound_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr element_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr element_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr element_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void element_type_def ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void element_type_def_i ( CORBA_IDLType_ptr element_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: void destroy_element_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys an anonymous non-primitive element type. diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp index 7b168fb9cb0..64cd9fb8ff7 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp +++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp @@ -15,7 +15,7 @@ IFR_Servant_Factory::IFR_Servant_Factory (TAO_Repository_i *repo) TAO_IDLType_i * IFR_Servant_Factory::create_idltype ( ACE_Configuration_Section_Key servant_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { u_int def_kind = 0; @@ -231,7 +231,7 @@ IFR_Servant_Factory::create_idltype ( TAO_Contained_i * IFR_Servant_Factory::create_contained ( ACE_Configuration_Section_Key servant_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { u_int def_kind = 0; @@ -513,7 +513,7 @@ IFR_Servant_Factory::create_contained ( TAO_Container_i * IFR_Servant_Factory::create_container ( ACE_Configuration_Section_Key servant_key - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { u_int def_kind = 0; @@ -642,7 +642,7 @@ PortableServer::Servant IFR_Servant_Factory::create_tie ( ACE_Configuration_Section_Key servant_key, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { u_int def_kind = 0; @@ -1370,7 +1370,7 @@ IFR_Servant_Factory::create_tie ( CORBA::Object_ptr IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind, const char *obj_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId (obj_id); @@ -1488,5 +1488,5 @@ IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind, return this->repo_->ir_poa ()->create_reference_with_id (oid.in (), repo_id.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.h b/TAO/orbsvcs/IFR_Service/Servant_Factory.h index 8c2657f65d3..dd9b29d1934 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Factory.h +++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.h @@ -47,28 +47,28 @@ public: // constructor TAO_IDLType_i *create_idltype (ACE_Configuration_Section_Key key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // For internal use - faster than creating an object reference and // sending a request, and can call utility functions not in IDL. TAO_Contained_i *create_contained (ACE_Configuration_Section_Key key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // For internal use - faster than creating an object reference and // sending a request, and can call utility functions not in IDL. TAO_Container_i *create_container (ACE_Configuration_Section_Key key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // For internal use - faster than creating an object reference and // sending a request, and can call utility functions not in IDL. PortableServer::Servant create_tie (ACE_Configuration_Section_Key key, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Used by the servant locator to create a servant. CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind, const char *obj_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Used to create return values. private: TAO_Repository_i *repo_; diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp index effbe438f55..4065aead98c 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp +++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp @@ -17,7 +17,7 @@ IFR_ServantLocator::preinvoke ( PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) @@ -41,7 +41,7 @@ IFR_ServantLocator::preinvoke ( PortableServer::Servant servant = this->repo_->servant_factory ()->create_tie (servant_key, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); cookie = servant; @@ -56,7 +56,7 @@ IFR_ServantLocator::postinvoke ( const char * /* operation */, PortableServer::ServantLocator::Cookie /* cookie */, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.h b/TAO/orbsvcs/IFR_Service/Servant_Locator.h index 51c681a1501..9a2293854b9 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Locator.h +++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.h @@ -45,7 +45,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -58,7 +58,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever an IR object servant completes a diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp index c84ee3c3fa5..b536f8981f5 100644 --- a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp @@ -18,23 +18,23 @@ TAO_StringDef_i::~TAO_StringDef_i (void) } CORBA::DefinitionKind -TAO_StringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_String; } void -TAO_StringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_StringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_StringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; @@ -48,38 +48,38 @@ TAO_StringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::TypeCode_ptr -TAO_StringDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_StringDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_StringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_StringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_string_tc ( bound - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } CORBA::ULong -TAO_StringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL) +TAO_StringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::ULong -TAO_StringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int retval = 0; @@ -92,18 +92,18 @@ TAO_StringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_StringDef_i::bound (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->bound_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_StringDef_i::bound_i (CORBA::ULong bound - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.h b/TAO/orbsvcs/IFR_Service/StringDef_i.h index 4ed4bb83f14..6bc502446e3 100644 --- a/TAO/orbsvcs/IFR_Service/StringDef_i.h +++ b/TAO/orbsvcs/IFR_Service/StringDef_i.h @@ -51,53 +51,53 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong bound_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void bound_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp index acb2883004c..08dfaa51490 100644 --- a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp @@ -23,45 +23,45 @@ TAO_StructDef_i::~TAO_StructDef_i (void) } CORBA::DefinitionKind -TAO_StructDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_StructDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Struct; } void -TAO_StructDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_StructDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA::TypeCode_ptr -TAO_StructDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_StructDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -74,26 +74,26 @@ TAO_StructDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) "name", name); - CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_struct_tc (id.c_str (), name.c_str (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_StructDef_i::members (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_StructMemberSeq * -TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; @@ -187,11 +187,11 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) obj = this->repo_->servant_factory ()->create_objref (kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[k].type_def = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->repo_->config ()->expand_path (this->repo_->root_key (), @@ -201,12 +201,12 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) impl = this->repo_->servant_factory ()->create_idltype (member_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr<TAO_IDLType_i> safety (impl); - retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -215,22 +215,22 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_StructDef_i::members (const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->members_i (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count = members.length (); @@ -260,7 +260,7 @@ TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var path = diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.h b/TAO/orbsvcs/IFR_Service/StructDef_i.h index 0249cafeadc..cf3836abc29 100644 --- a/TAO/orbsvcs/IFR_Service/StructDef_i.h +++ b/TAO/orbsvcs/IFR_Service/StructDef_i.h @@ -52,53 +52,53 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry and its contents. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_StructMemberSeq *members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_StructMemberSeq *members_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( const CORBA_StructMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp index 859c5fa8359..8884a883e9f 100644 --- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp @@ -21,16 +21,16 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void) } CORBA_Contained::Description * -TAO_TypedefDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_TypedefDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA_Contained::Description *desc_ptr = 0; @@ -41,15 +41,15 @@ TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) CORBA_Contained::Description_var retval = desc_ptr; - retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA_TypeDescription td; ACE_CHECK_RETURN (0); - td.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + td.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER); - td.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER); + td.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TString container_id; @@ -60,10 +60,10 @@ TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL) td.defined_in = container_id.c_str (); - td.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER); + td.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - td.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + td.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval->value <<= td; diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h index 40e966cded2..cf1a24a8eec 100644 --- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h +++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h @@ -34,7 +34,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_TypedefDef_i : public virtual TAO_Contained_i, +class TAO_TypedefDef_i : public virtual TAO_Contained_i, public virtual TAO_IDLType_i { // = TITLE @@ -53,13 +53,13 @@ public: // Destructor virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp index 4ca5f622103..097f7fc1cbb 100644 --- a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp @@ -23,45 +23,45 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void) } CORBA::DefinitionKind -TAO_UnionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UnionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Union; } void -TAO_UnionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_UnionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our members. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Destroy ourself. - TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CORBA::TypeCode_ptr -TAO_UnionDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_UnionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -74,30 +74,30 @@ TAO_UnionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) "name", name); - CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - CORBA_UnionMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_UnionMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_union_tc (id.c_str (), name.c_str (), tc.in (), members.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString disc_path; @@ -113,24 +113,24 @@ TAO_UnionDef_i::discriminator_type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (disc_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); auto_ptr<TAO_IDLType_i> safety (impl); - return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_UnionDef_i::discriminator_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_UnionDef_i::discriminator_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString disc_path; @@ -155,36 +155,36 @@ TAO_UnionDef_i::discriminator_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, disc_path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_UnionDef_i::discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->discriminator_type_def_i (discriminator_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_UnionDef_i::discriminator_type_def_i ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (discriminator_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var disc_path = @@ -196,16 +196,16 @@ TAO_UnionDef_i::discriminator_type_def_i ( } CORBA_UnionMemberSeq * -TAO_UnionDef_i::members (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_UnionMemberSeq * -TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; @@ -281,7 +281,7 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) this->fetch_label (next_key, retval[k] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->repo_->config ()->get_string_value (next_key, @@ -303,21 +303,21 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) obj = this->repo_->servant_factory ()->create_objref (def_kind, path.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); retval[k].type_def = CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); impl = this->repo_->servant_factory ()->create_idltype (entry_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_ptr<TAO_IDLType_i> safety (impl); - retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -326,22 +326,22 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->members_i (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy our old members, both refs and defns. - TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TString section_name; @@ -375,7 +375,7 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var member_path = @@ -387,14 +387,14 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members this->store_label (member_key, members[i].label - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } void TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, CORBA_UnionMember &member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Configuration::VALUETYPE vt; @@ -414,10 +414,10 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, "label", value); - CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; switch (kind) diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.h b/TAO/orbsvcs/IFR_Service/UnionDef_i.h index ea97eaae096..d9377b0c8ed 100644 --- a/TAO/orbsvcs/IFR_Service/UnionDef_i.h +++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.h @@ -52,85 +52,85 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry and its contents. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr discriminator_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr discriminator_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr discriminator_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr discriminator_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void discriminator_type_def ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void discriminator_type_def_i ( CORBA_IDLType_ptr discriminator_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_UnionMemberSeq *members ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_UnionMemberSeq *members_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void members ( const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void members_i ( const CORBA_UnionMemberSeq &members - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -138,7 +138,7 @@ private: void fetch_label ( const ACE_Configuration_Section_Key member_key, CORBA_UnionMember &member - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Used by members() to get each member's label value. diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp index e36bdaa2ee9..65e7d8ca51f 100644 --- a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp @@ -18,73 +18,73 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void) } CORBA::DefinitionKind -TAO_UsesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UsesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Uses; } -void -TAO_UsesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +void +TAO_UsesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -void -TAO_UsesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +void +TAO_UsesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_UsesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_UsesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_UsesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -CORBA_InterfaceDef_ptr -TAO_UsesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL) +CORBA_InterfaceDef_ptr +TAO_UsesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ()); - return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA_InterfaceDef_ptr -TAO_UsesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +CORBA_InterfaceDef_ptr +TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO return 0; } -CORBA::Boolean -TAO_UsesDef_i::is_multiple (TAO_ENV_SINGLE_ARG_DECL) +CORBA::Boolean +TAO_UsesDef_i::is_multiple (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_multiple_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_multiple_i (ACE_ENV_SINGLE_ARG_PARAMETER); } -CORBA::Boolean -TAO_UsesDef_i::is_multiple_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +CORBA::Boolean +TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.h b/TAO/orbsvcs/IFR_Service/UsesDef_i.h index fae4dae86f8..e032dbf7bc9 100644 --- a/TAO/orbsvcs/IFR_Service/UsesDef_i.h +++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.h @@ -50,51 +50,51 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_InterfaceDef_ptr interface_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDef_ptr interface_type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_multiple ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_multiple_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp index 802bef26eca..97b29fd2fe3 100644 --- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp @@ -24,23 +24,23 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void) } CORBA::DefinitionKind -TAO_ValueBoxDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ValueBoxDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_ValueBox; } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString id; @@ -66,31 +66,31 @@ TAO_ValueBoxDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) TAO_IDLType_i *impl = this->repo_->servant_factory ()->create_idltype (boxed_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); auto_ptr<TAO_IDLType_i> safety (impl); - CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (), name.c_str (), tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ValueBoxDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ValueBoxDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString boxed_type; @@ -115,32 +115,32 @@ TAO_ValueBoxDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->repo_->servant_factory ()->create_objref (def_kind, boxed_type.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_IDLType::_nil ()); return CORBA_IDLType::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->original_type_def_i (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->repo_->ir_poa ()->reference_to_id (original_type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var boxed_type = diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h index f477053a276..c7b649671fb 100644 --- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h @@ -51,42 +51,42 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_IDLType_ptr original_type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr original_type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void original_type_def ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void original_type_def_i ( CORBA_IDLType_ptr original_type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp index 1c41ea260f4..147d7cac989 100644 --- a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp @@ -20,39 +20,39 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void) } CORBA::DefinitionKind -TAO_ValueDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ValueDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Value; } void -TAO_ValueDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ValueDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ValueDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ValueDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -60,16 +60,16 @@ TAO_ValueDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A } CORBA::TypeCode_ptr -TAO_ValueDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ValueDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -77,16 +77,16 @@ TAO_ValueDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_P } CORBA_InterfaceDefSeq * -TAO_ValueDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InterfaceDefSeq * -TAO_ValueDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -96,20 +96,20 @@ TAO_ValueDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ void TAO_ValueDef_i::supported_interfaces ( const CORBA_InterfaceDefSeq &supported_interfaces - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->supported_interfaces_i (supported_interfaces - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::supported_interfaces_i ( const CORBA_InterfaceDefSeq & /* supported_interfaces */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -117,16 +117,16 @@ TAO_ValueDef_i::supported_interfaces_i ( } CORBA_InitializerSeq * -TAO_ValueDef_i::initializers (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::initializers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->initializers_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_InitializerSeq * -TAO_ValueDef_i::initializers_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -135,34 +135,34 @@ TAO_ValueDef_i::initializers_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING void TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->initializers_i (initializers - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::initializers_i (const CORBA_InitializerSeq & /* initializers */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_ValueDef_ptr -TAO_ValueDef_i::base_value (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::base_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ()); - return this->base_value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->base_value_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDef_ptr -TAO_ValueDef_i::base_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -171,34 +171,34 @@ TAO_ValueDef_i::base_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE void TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->base_value_i (base_value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::base_value_i (CORBA_ValueDef_ptr /* base_value */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_ValueDefSeq * -TAO_ValueDef_i::abstract_base_values (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::abstract_base_values (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->abstract_base_values_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->abstract_base_values_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDefSeq * -TAO_ValueDef_i::abstract_base_values_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -208,20 +208,20 @@ TAO_ValueDef_i::abstract_base_values_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ void TAO_ValueDef_i::abstract_base_values ( const CORBA_ValueDefSeq &abstract_base_values - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->abstract_base_values_i (abstract_base_values - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::abstract_base_values_i ( const CORBA_ValueDefSeq & /* abstract_base_values */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -229,16 +229,16 @@ TAO_ValueDef_i::abstract_base_values_i ( } CORBA::Boolean -TAO_ValueDef_i::is_abstract (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::is_abstract (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_abstract_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_ValueDef_i::is_abstract_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::is_abstract_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -247,34 +247,34 @@ TAO_ValueDef_i::is_abstract_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGL void TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->is_abstract (is_abstract - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::is_abstract_i (CORBA::Boolean /* is_abstract */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Boolean -TAO_ValueDef_i::is_custom (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::is_custom (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_custom_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_ValueDef_i::is_custom_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::is_custom_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -283,34 +283,34 @@ TAO_ValueDef_i::is_custom_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ void TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->is_custom_i (is_custom - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::is_custom_i (CORBA::Boolean /* is_custom */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Boolean -TAO_ValueDef_i::is_truncatable (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::is_truncatable (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->is_truncatable_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Boolean -TAO_ValueDef_i::is_truncatable_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::is_truncatable_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -319,18 +319,18 @@ TAO_ValueDef_i::is_truncatable_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI void TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->is_truncatable_i (is_truncatable - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -338,18 +338,18 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */ CORBA::Boolean TAO_ValueDef_i::is_a (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); return this->is_a_i (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_ValueDef_i::is_a_i (const char *id - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0) @@ -362,16 +362,16 @@ TAO_ValueDef_i::is_a_i (const char *id } CORBA_ValueDef::FullValueDescription * -TAO_ValueDef_i::describe_value (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueDef_i::describe_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_value_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_value_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_ValueDef::FullValueDescription * -TAO_ValueDef_i::describe_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -384,7 +384,7 @@ TAO_ValueDef_i::create_value_member (const char *id, const char *version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueMemberDef::_nil ()); @@ -394,7 +394,7 @@ TAO_ValueDef_i::create_value_member (const char *id, version, type, access - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_ValueMemberDef_ptr @@ -403,7 +403,7 @@ TAO_ValueDef_i::create_value_member_i (const char * /* id */, const char * /* version */, CORBA_IDLType_ptr /* type */, CORBA::Visibility /* access */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -417,7 +417,7 @@ TAO_ValueDef_i::create_attribute ( const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -428,7 +428,7 @@ TAO_ValueDef_i::create_attribute ( version, type, mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_AttributeDef_ptr @@ -438,7 +438,7 @@ TAO_ValueDef_i::create_attribute_i ( const char * /* version */, CORBA_IDLType_ptr /* type */, CORBA::AttributeMode /* mode */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -456,7 +456,7 @@ TAO_ValueDef_i::create_operation ( const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -470,7 +470,7 @@ TAO_ValueDef_i::create_operation ( params, exceptions, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_OperationDef_ptr @@ -483,7 +483,7 @@ TAO_ValueDef_i::create_operation_i ( const CORBA_ParDescriptionSeq & /* params */, const CORBA_ExceptionDefSeq & /* exceptions */, const CORBA_ContextIdSeq & /* contexts */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.h b/TAO/orbsvcs/IFR_Service/ValueDef_i.h index 4bd20588fd8..4675e1b9908 100644 --- a/TAO/orbsvcs/IFR_Service/ValueDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.h @@ -53,219 +53,219 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's pure virtual function. virtual CORBA_InterfaceDefSeq *supported_interfaces ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InterfaceDefSeq *supported_interfaces_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void supported_interfaces ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void supported_interfaces_i ( const CORBA_InterfaceDefSeq & supported_interfaces - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_InitializerSeq *initializers ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_InitializerSeq *initializers_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void initializers ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void initializers_i ( const CORBA_InitializerSeq & initializers - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDef_ptr base_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDef_ptr base_value_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void base_value ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void base_value_i ( CORBA_ValueDef_ptr base_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDefSeq *abstract_base_values ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDefSeq *abstract_base_values_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void abstract_base_values ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void abstract_base_values_i ( const CORBA_ValueDefSeq & abstract_base_values - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_abstract ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_abstract_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void is_abstract ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void is_abstract_i ( CORBA::Boolean is_abstract - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_custom ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_custom_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void is_custom ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void is_custom_i ( CORBA::Boolean is_custom - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_truncatable ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_truncatable_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void is_truncatable ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void is_truncatable_i ( CORBA::Boolean is_truncatable - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean is_a ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Boolean is_a_i ( const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_ValueDef::FullValueDescription *describe_value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_ValueDef::FullValueDescription *describe_value_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -275,7 +275,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -285,7 +285,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -295,7 +295,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -305,7 +305,7 @@ public: const char *version, CORBA_IDLType_ptr type, CORBA::AttributeMode mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -318,7 +318,7 @@ public: const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -331,7 +331,7 @@ public: const CORBA_ParDescriptionSeq ¶ms, const CORBA_ExceptionDefSeq &exceptions, const CORBA_ContextIdSeq &contexts - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp index e99f4fcd66e..8e6b0912a21 100644 --- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp @@ -20,39 +20,39 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void) } CORBA::DefinitionKind -TAO_ValueMemberDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ValueMemberDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_ValueMember; } void -TAO_ValueMemberDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_ValueMemberDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueMemberDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA_Contained::Description * -TAO_ValueMemberDef_i::describe (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::describe (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_Contained::Description * -TAO_ValueMemberDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -60,16 +60,16 @@ TAO_ValueMemberDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI } CORBA::TypeCode_ptr -TAO_ValueMemberDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_ValueMemberDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueMemberDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -77,16 +77,16 @@ TAO_ValueMemberDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE } CORBA_IDLType_ptr -TAO_ValueMemberDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ()); - return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA_IDLType_ptr -TAO_ValueMemberDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) +TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -95,34 +95,34 @@ TAO_ValueMemberDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI void TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->type_def_i (type_def - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueMemberDef_i::type_def_i (CORBA_IDLType_ptr /* type_def */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO } CORBA::Visibility -TAO_ValueMemberDef_i::access (TAO_ENV_SINGLE_ARG_DECL) +TAO_ValueMemberDef_i::access (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->access_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->access_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Visibility -TAO_ValueMemberDef_i::access_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) +TAO_ValueMemberDef_i::access_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO @@ -131,18 +131,18 @@ TAO_ValueMemberDef_i::access_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING void TAO_ValueMemberDef_i::access (CORBA::Visibility access - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->access (access - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ValueMemberDef_i::access_i (CORBA::Visibility /* access */ - TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ ) + ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ ) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h index 3fdd11ea192..796ef9110cc 100644 --- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h +++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h @@ -50,85 +50,85 @@ public: // Destructor virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_Contained::Description *describe ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA_Contained::Description *describe_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From Contained_i's pure virtual function. virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA_IDLType_ptr type_def ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA_IDLType_ptr type_def_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void type_def ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void type_def_i ( CORBA_IDLType_ptr type_def - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Visibility access ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Visibility access_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void access ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void access_i ( CORBA::Visibility access - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp index 96e5401bc90..2b0ad879c71 100644 --- a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp +++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp @@ -20,23 +20,23 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void) } CORBA::DefinitionKind -TAO_WstringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_WstringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::dk_Wstring; } void -TAO_WstringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_WstringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_WstringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TString name; @@ -50,36 +50,36 @@ TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::TypeCode_ptr -TAO_WstringDef_i::type (TAO_ENV_SINGLE_ARG_DECL) +TAO_WstringDef_i::type (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); - return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::TypeCode_ptr -TAO_WstringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_WstringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); return this->repo_->tc_factory ()->create_wstring_tc (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::ULong -TAO_WstringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL) +TAO_WstringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_READ_GUARD_RETURN (0); - return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::ULong -TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_WstringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { u_int retval = 0; @@ -92,18 +92,18 @@ TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_WstringDef_i::bound (CORBA::ULong bound - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_IFR_WRITE_GUARD; this->bound_i (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_WstringDef_i::bound_i (CORBA::ULong bound - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->repo_->config ()->set_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.h b/TAO/orbsvcs/IFR_Service/WstringDef_i.h index 80c3387cfb0..6e9eeae7bc1 100644 --- a/TAO/orbsvcs/IFR_Service/WstringDef_i.h +++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.h @@ -51,53 +51,53 @@ public: // Destructor. virtual CORBA::DefinitionKind def_kind ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return our definition kind. virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Remove the repository entry. virtual void destroy_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::TypeCode_ptr type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's virtual function. virtual CORBA::TypeCode_ptr type_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // From IDLType_i's virtual function. virtual CORBA::ULong bound ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong bound_i ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void bound ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void bound_i ( CORBA::ULong bound - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index 4733035164f..db50274b7e9 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -93,22 +93,22 @@ BE_cleanup (void) idl_global = 0; // Remove the holding scope entry from the repository. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var result = be_global->repository ()->lookup_id (be_global->holding_scope_name () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (result.in ())) { CORBA_ModuleDef_var scope = CORBA_ModuleDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - scope->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + scope->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -140,18 +140,18 @@ TAO_IFR_BE_Export int BE_ifr_init (int &ac, char *av[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { be_global->orb (CORBA::ORB_init (ac, av, 0 - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; CORBA::Object_var object = be_global->orb ()->resolve_initial_references ("InterfaceRepository" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -165,7 +165,7 @@ BE_ifr_init (int &ac, } CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (repo.in ())) @@ -193,14 +193,14 @@ BE_ifr_init (int &ac, } void -BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL) +BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL) { CORBA_ModuleDef_ptr scope = CORBA_ModuleDef::_nil (); // If we are multi-threaded, it may already be created. CORBA_Contained_var result = be_global->repository ()->lookup_id (be_global->holding_scope_name () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (result.in ())) @@ -210,14 +210,14 @@ BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL) be_global->holding_scope_name (), be_global->holding_scope_name (), "1.0" - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; } else { scope = CORBA_ModuleDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -228,10 +228,10 @@ BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL) TAO_IFR_BE_Export void BE_produce (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - BE_create_holding_scope (TAO_ENV_SINGLE_ARG_PARAMETER); + BE_create_holding_scope (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the root node. diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index 55409c8385a..fa2892b2395 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -75,13 +75,13 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node) int ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->ir_current_ = be_global->repository ()->get_primitive ( this->predefined_type_to_pkind (node) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -107,14 +107,14 @@ ifr_adding_visitor::visit_module (AST_Module *node) CORBA_Container_var new_def; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // If this module been opened before, it will already be in // the repository. CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -128,7 +128,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) node->repoID (), node->local_name ()->get_string (), node->version () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -145,7 +145,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) } else { - CORBA::DefinitionKind kind = prev_def->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // If the line below is true, we are clobbering a previous @@ -154,7 +154,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) // original entry, create the new one, and let the user beware. if (kind != CORBA::dk_Module) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the brach where prev_def.in() is 0. @@ -164,7 +164,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) { new_def = CORBA_Container::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -230,20 +230,20 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) return this->visit_valuetype (node); } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this interface already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. if (CORBA::is_nil (prev_def.in ())) { int status = this->create_interface_def (node - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return status; @@ -273,38 +273,38 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) // previous entry, forward declared or not. if (node->ifr_fwd_added () == 0) { - CORBA::DefinitionKind kind = - prev_def->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = + prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (kind == CORBA::dk_Interface) { CORBA::InterfaceDef_var iface = CORBA::InterfaceDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ContainedSeq_var contents = + CORBA::ContainedSeq_var contents = iface->contents (CORBA::dk_all, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = contents->length (); for (CORBA::ULong i = 0; i < length; ++i) { - contents[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } else { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int status = this->create_interface_def (node - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return status; @@ -325,7 +325,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) { result = be_global->repository ()->lookup_id (parents[i]->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If one of our interface's parents is not in the repository, @@ -337,14 +337,14 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) { this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK return 0; } bases[i] = CORBA_InterfaceDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (bases[i].in ())) @@ -362,11 +362,11 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) CORBA_InterfaceDef_var extant_def = CORBA_InterfaceDef::_narrow (prev_def. in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; extant_def->base_interfaces (bases - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK node->ifr_added (1); @@ -429,7 +429,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) // defined/not added - takes the other branch. // defined/added - we're ok. this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -456,13 +456,13 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node) AST_Interface *i = node->full_definition (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this interface already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (i->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -487,7 +487,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node) i->local_name ()->get_string (), i->version (), bases - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -498,7 +498,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node) i->local_name ()->get_string (), i->version (), bases - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -553,12 +553,12 @@ ifr_adding_visitor::visit_structure (AST_Structure *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -584,7 +584,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return this->visit_structure (node); @@ -592,7 +592,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -632,13 +632,13 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -674,7 +674,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -699,7 +699,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return this->visit_enum (node); @@ -709,7 +709,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node) // the current IR object holder. this->ir_current_ = CORBA_EnumDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -768,14 +768,14 @@ ifr_adding_visitor::visit_field (AST_Field *node) int ifr_adding_visitor::visit_attribute (AST_Attribute *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { AST_Type *type = node->field_type (); // Updates ir_current_. this->get_referenced_type (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::AttributeMode mode = @@ -787,7 +787,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node) { CORBA_InterfaceDef_var iface = CORBA_InterfaceDef::_narrow (current_scope - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_AttributeDef_var new_def = @@ -796,7 +796,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node) node->version (), this->ir_current_.in (), mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -830,12 +830,12 @@ ifr_adding_visitor::visit_union (AST_Union *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -861,7 +861,7 @@ ifr_adding_visitor::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return this->visit_union (node); @@ -869,7 +869,7 @@ ifr_adding_visitor::visit_union (AST_Union *node) this->ir_current_ = CORBA_UnionDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -895,12 +895,12 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) const char *id = node->repoID (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Nothing prevents this constant's repo id from already being @@ -916,7 +916,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -933,7 +933,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) CORBA_IDLType_var idl_type = be_global->repository ()->get_primitive (pkind - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any any; @@ -952,7 +952,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) node->version (), idl_type.in (), any - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -982,11 +982,11 @@ ifr_adding_visitor::visit_constant (AST_Constant *node) int ifr_adding_visitor::visit_array (AST_Array *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->element_type (node->base_type () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AST_Expression **dims = node->dims (); @@ -997,7 +997,7 @@ ifr_adding_visitor::visit_array (AST_Array *node) be_global->repository ()->create_array ( dims[i - 1]->ev ()->u.ulval, this->ir_current_.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -1017,18 +1017,18 @@ ifr_adding_visitor::visit_array (AST_Array *node) int ifr_adding_visitor::visit_sequence (AST_Sequence *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->element_type (node->base_type () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->ir_current_ = be_global->repository ()->create_sequence ( node->max_size ()->ev ()->u.ulval, this->ir_current_.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -1053,20 +1053,20 @@ ifr_adding_visitor::visit_string (AST_String *node) CORBA::ULong bound = ACE_static_cast (CORBA::ULong, ev->u.ulval); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (node->node_type () == AST_Decl::NT_string) { this->ir_current_ = be_global->repository ()->create_string (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { this->ir_current_ = be_global->repository ()->create_wstring (bound - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -1091,20 +1091,20 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this typedef already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. if (CORBA::is_nil (prev_def.in ())) { this->element_type (node->base_type () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_Container_ptr current_scope = CORBA_Container::_nil (); @@ -1117,7 +1117,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) node->local_name ()->get_string (), node->version (), this->ir_current_.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -1142,7 +1142,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -1151,7 +1151,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) this->ir_current_ = CORBA_TypedefDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1170,12 +1170,12 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node) int ifr_adding_visitor::visit_root (AST_Root *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Container_var new_scope = CORBA_Container::_narrow (be_global->repository () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) @@ -1233,12 +1233,12 @@ ifr_adding_visitor::visit_native (AST_Native *node) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -1252,7 +1252,7 @@ ifr_adding_visitor::visit_native (AST_Native *node) node->repoID (), node->local_name ()->get_string (), node->version () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; } @@ -1277,7 +1277,7 @@ ifr_adding_visitor::visit_native (AST_Native *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -1286,7 +1286,7 @@ ifr_adding_visitor::visit_native (AST_Native *node) this->ir_current_ = CORBA_NativeDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1481,7 +1481,7 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev, void ifr_adding_visitor::element_type (AST_Type *base_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (base_type->anonymous ()) { @@ -1498,7 +1498,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type { CORBA_Contained_var contained = be_global->repository ()->lookup_id (base_type->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (contained.in ())) @@ -1511,14 +1511,14 @@ ifr_adding_visitor::element_type (AST_Type *base_type } this->ir_current_ = CORBA_IDLType::_narrow (contained.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } int ifr_adding_visitor::create_interface_def (AST_Interface *node - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong, node->n_inherits ()); @@ -1548,11 +1548,11 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node result = be_global->repository ()->lookup_id (parents[i]->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); bases[i] = CORBA_InterfaceDef::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (bases[i].in ())) @@ -1582,7 +1582,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node node->local_name ()->get_string (), node->version (), bases - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -1593,7 +1593,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node node->local_name ()->get_string (), node->version (), bases - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -1604,7 +1604,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node // Push the new IR object onto the scope stack. CORBA_Container_var new_scope = CORBA_Container::_narrow (new_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (be_global->ifr_scopes ().push (new_scope.in ()) != 0) @@ -1672,7 +1672,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node void ifr_adding_visitor::get_referenced_type (AST_Type *node - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { switch (node->node_type ()) { @@ -1701,12 +1701,12 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h index 8aad716a169..e007e6fc60a 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h @@ -117,16 +117,16 @@ protected: // Determine the primitive type and insert into the Any. void element_type (AST_Type *base_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Creates or looks up the element type of an array or sequence, // and stores the result in ir_current_. int create_interface_def (AST_Interface *node - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Common code factored out of visit_interface(). void get_referenced_type (AST_Type *node - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Utility method to update ir_current_ for struct members, union // members, operation parameters and operation return types. diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp index 935b4629b9b..8cf19deac77 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -36,7 +36,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) AST_Field **f = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Visit each field. @@ -77,7 +77,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) else { // Updates ir_current_. - this->get_referenced_type (ft TAO_ENV_ARG_PARAMETER); + this->get_referenced_type (ft ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -110,13 +110,13 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node) int ifr_adding_visitor_exception::visit_structure (AST_Structure *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this union already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -135,7 +135,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing ExceptionDef hasn't been created @@ -155,7 +155,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -164,7 +164,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -185,12 +185,12 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node) int ifr_adding_visitor_exception::visit_exception (AST_Exception *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (prev_def.in ())) @@ -201,7 +201,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will create a new EnumDef entry. @@ -245,7 +245,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) node->local_name ()->get_string (), node->version (), this->members_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -257,23 +257,23 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) CORBA_Container_var new_container = CORBA_Container::_narrow (new_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < size; ++i) { this->move_queue_.dequeue_head (traveller); - CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::String_var version = traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var version = traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; traveller->move (new_container.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -297,13 +297,13 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node) int ifr_adding_visitor_exception::visit_enum (AST_Enum *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -334,13 +334,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_queue_.enqueue_tail (tmp); @@ -355,7 +355,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -364,7 +364,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -385,13 +385,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node) int ifr_adding_visitor_exception::visit_union (AST_Union *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this union already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -410,7 +410,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing ExceptionDef hasn't been created @@ -430,7 +430,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -439,7 +439,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp index d2da1df4f3a..cef132718d0 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp @@ -20,7 +20,7 @@ ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void) int ifr_adding_visitor_operation::visit_operation (AST_Operation *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // If this operation is already in the repository (for example, if @@ -30,7 +30,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (prev_def.in ())) @@ -88,11 +88,11 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) prev_def = be_global->repository ()->lookup_id (ex->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exceptions[i++] = CORBA_ExceptionDef::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ex_iter.next (); @@ -134,7 +134,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) // Updates ir_current_. this->get_referenced_type (return_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Is the operation oneway? @@ -150,7 +150,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) { CORBA_InterfaceDef_var iface = CORBA_InterfaceDef::_narrow (current_scope - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA_OperationDef_var new_def = @@ -162,7 +162,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node) this->params_, exceptions, contexts - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -199,12 +199,12 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node) AST_Type *arg_type = node->field_type (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Updates ir_current_. this->get_referenced_type (arg_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->params_[this->index_].type_def = diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp index 33ac960b3ee..af1db91e347 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp @@ -39,7 +39,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) AST_Field **f = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Visit each field. @@ -90,7 +90,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_queue_.enqueue_tail (tmp); @@ -114,7 +114,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) { // Updates ir_current_. this->get_referenced_type (ft - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -147,12 +147,12 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node) int ifr_adding_visitor_structure::visit_structure (AST_Structure *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -177,7 +177,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) node->local_name ()->get_string (), node->version (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -202,7 +202,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) node->local_name ()->get_string (), node->version (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -216,24 +216,24 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) CORBA_Container_var new_container = CORBA_Container::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < size; ++i) { this->move_queue_.dequeue_head (traveller); - CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var version = - traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER); + traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; traveller->move (new_container.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -248,7 +248,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -257,7 +257,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -278,13 +278,13 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node) int ifr_adding_visitor_structure::visit_enum (AST_Enum *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -315,13 +315,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing StructDef hasn't been created @@ -340,7 +340,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -349,7 +349,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -370,13 +370,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node) int ifr_adding_visitor_structure::visit_union (AST_Union *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this union already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -395,7 +395,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing StructDef hasn't been created @@ -415,7 +415,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -424,7 +424,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp index 3a312f7b533..7646cc4d171 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp @@ -42,7 +42,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) // Index into members_. CORBA::ULong index = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Visit each field. @@ -93,7 +93,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->move_queue_.enqueue_tail (tmp); @@ -117,7 +117,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) { // Updates ir_current_. this->get_referenced_type (ft - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -202,13 +202,13 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node) int ifr_adding_visitor_union::visit_structure (AST_Structure *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this struct already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -227,7 +227,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node) CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (visitor.ir_current () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing UnionDef hasn't been created @@ -247,7 +247,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -256,7 +256,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -277,13 +277,13 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node) int ifr_adding_visitor_union::visit_enum (AST_Enum *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Is this enum already in the respository? CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If not, create a new entry. @@ -312,13 +312,13 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node) node->local_name ()->get_string (), node->version (), members - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; CORBA_Contained_ptr tmp = CORBA_Contained::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Since the enclosing UnionDef hasn't been created @@ -337,7 +337,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -346,7 +346,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -367,12 +367,12 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node) int ifr_adding_visitor_union::visit_union (AST_Union *node) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA_Contained_var prev_def = be_global->repository ()->lookup_id (node->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (prev_def.in ())) @@ -387,7 +387,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) { CORBA_Contained_var disc_def = be_global->repository ()->lookup_id (disc_type->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (disc_def.in ())) @@ -404,10 +404,10 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) CORBA_IDLType_var idl_def = CORBA_IDLType::_narrow (disc_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->disc_tc_ = idl_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disc_tc_ = idl_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -443,7 +443,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) node->version (), this->ir_current_.in (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } else @@ -469,7 +469,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) node->version (), this->ir_current_.in (), this->members_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -483,24 +483,24 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) CORBA_Container_var new_container = CORBA_Container::_narrow (this->ir_current_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (size_t i = 0; i < size; ++i) { this->move_queue_.dequeue_head (traveller); - CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var version = - traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER); + traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; traveller->move (new_container.in (), name.in (), version.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -515,7 +515,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) // original entry, create the new one, and let the user beware. if (node->ifr_added () == 0) { - prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This call will take the other branch. @@ -524,7 +524,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node) this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp index 8baa46d085f..e4dd26f498d 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp @@ -26,7 +26,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) AST_Decl *d = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Continue until each element is visited. @@ -54,7 +54,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) CORBA_Contained_var top_level = be_global->repository ()->lookup_id (d->repoID () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (top_level.in ())) @@ -62,7 +62,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node) // All we have to do is call destroy() on each IR object // in the global scope, because destroy() works on all // the contents recursively. - top_level->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + top_level->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } |