diff options
Diffstat (limited to 'TAO/tao/PortableServer')
70 files changed, 2243 insertions, 2243 deletions
diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.cpp b/TAO/tao/PortableServer/AMH_Response_Handler.cpp index 0e0f18c78c1..9c7256c746f 100644 --- a/TAO/tao/PortableServer/AMH_Response_Handler.cpp +++ b/TAO/tao/PortableServer/AMH_Response_Handler.cpp @@ -42,7 +42,7 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) } // @@ Mayur: change the signature of this function to use -// TAO_ENV_SINGLE_ARG_DECL... and then change the generated code in +// ACE_ENV_SINGLE_ARG_DECL... and then change the generated code in // the IDL compiler too! void TAO_AMH_Response_Handler::_tao_rh_init_reply (void) @@ -51,27 +51,27 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) if (this->once_only_ != TAO_UNINITIALISED_REPLY) { - // Raise exception ... when exceptions have been implemented, send the + // Raise exception ... when exceptions have been implemented, send the // appropriate exception to the client ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR. Tried calling method twice \n"))); } // We are now ready to initialise the reply this->once_only_ = TAO_INITIALISING_REPLY; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Initialising RH ... \n"))); // Construct our reply generator. TAO_Pluggable_Reply_Params_Base reply_params; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting request_id ... \n"))); reply_params.request_id_ = this->request_id_; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tInitialising reply svc cntxt ... \n"))); reply_params.service_context_notowned (&(this->reply_service_context_.service_info ())); - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting argument flag ... \n"))); reply_params.argument_flag_ = this->argument_flag_; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting reply_status ... \n"))); if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION) { @@ -81,35 +81,35 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) { reply_params.reply_status_ = this->exception_type_; } - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tgenerating reply header ... \n"))); this->mesg_base_->generate_reply_header (this->_tao_out, reply_params); //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Done Initialising RH. \n"))); // We are done initialising the reply - this->once_only_ = TAO_INITIALISED_REPLY; + this->once_only_ = TAO_INITIALISED_REPLY; } void TAO_AMH_Response_Handler::_tao_rh_send_reply (void) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); - + // If the reply has not been initialised, raise an exception if (this->once_only_ != TAO_INITIALISED_REPLY) { - // Raise exception ... when exceptions have been implemented, send the + // Raise exception ... when exceptions have been implemented, send the // appropriate exception to the client ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR. Tried calling method twice \n"))); } - + this->once_only_ = TAO_SENDING_REPLY; - + //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO_RH sending message ... \n"))); - + // Send the message. int result = this->transport_->send_message (this->_tao_out); - + if (result == -1) { if (TAO_debug_level > 0) diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 652536ff186..5d23647a7ae 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -84,7 +84,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy, int unique_id_policy, int persistent_id_policy, const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : user_id_map_ (0), servant_map_ (0), id_uniqueness_strategy_ (0), diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 0e28031dc06..0e0f1d15f0e 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -77,7 +77,7 @@ public: int unique_id_policy, int persistent_id_policy, const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Constructor. ~TAO_Active_Object_Map (void); diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp index 30f5e9f4400..977e3cb6085 100644 --- a/TAO/tao/PortableServer/Collocated_Object.cpp +++ b/TAO/tao/PortableServer/Collocated_Object.cpp @@ -25,7 +25,7 @@ TAO_Collocated_Object::_servant (void) const */ TAO_Collocated_Object * TAO_Collocated_Object::_narrow (CORBA::Object_ptr object - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (object == 0) return 0; @@ -40,11 +40,11 @@ TAO_Collocated_Object::_narrow (CORBA::Object_ptr object CORBA::Boolean TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If the object is collocated then try locally.... if (!this->_is_collocated ()) - return this->CORBA_Object::_is_a (logical_type_id TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (logical_type_id ACE_ENV_ARG_PARAMETER); if (this->_stubobj ()->type_id.in () != 0 && ACE_OS::strcmp (logical_type_id, @@ -65,14 +65,14 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id servant_upcall.prepare_for_upcall (this->_object_key (), "_is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER); + return servant_upcall.servant ()->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER); } // Direct collocation strategy is used. if (this->servant_ != 0) - return this->servant_->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER); + return this->servant_->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER); // @@ Maybe we want to change this exception... ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); @@ -80,11 +80,11 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id CORBA::Boolean TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()) { CORBA::Boolean equivalent = - this->CORBA_Object::_is_equivalent (other_obj TAO_ENV_ARG_PARAMETER); + this->CORBA_Object::_is_equivalent (other_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (equivalent) @@ -106,7 +106,7 @@ TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj #if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Boolean -TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL) +TAO_Collocated_Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean _tao_retval = 0; @@ -114,7 +114,7 @@ TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL) { // If the object is collocated then try locally.... if (!this->_is_collocated ()) - return this->CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->CORBA_Object::_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_Stub *stub = this->_stubobj (); @@ -131,14 +131,14 @@ TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL) servant_upcall.prepare_for_upcall (this->_object_key (), "_non_existent", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return servant_upcall.servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); } // Direct collocation strategy is used. if (this->servant_ != 0) - return this->servant_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->servant_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); // @@ Maybe we want to change this exception... ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); diff --git a/TAO/tao/PortableServer/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h index 5326817da53..768d51b2286 100644 --- a/TAO/tao/PortableServer/Collocated_Object.h +++ b/TAO/tao/PortableServer/Collocated_Object.h @@ -44,17 +44,17 @@ public: */ static TAO_Collocated_Object *_narrow (CORBA::Object_ptr object - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Downcast operation // = The CORBA_Object methods, check the tao/Object.h file for details virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (()); #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_MINIMUM_CORBA */ virtual void *_tao_QueryInterface(ptr_arith_t type); diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index ffb35bb4320..8d4d5b2aa33 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -18,26 +18,26 @@ TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void) void TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if (TAO_HAS_MINIMUM_POA == 0) CORBA::Policy_var policy = policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION); PortableServer::ServantRetentionPolicy_var srp = PortableServer::ServantRetentionPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ServantRetentionPolicyValue servant_retention = - srp->value (TAO_ENV_SINGLE_ARG_PARAMETER); + srp->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policy = policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING); PortableServer::RequestProcessingPolicy_var rpp = PortableServer::RequestProcessingPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::RequestProcessingPolicyValue request_processing = - rpp->value (TAO_ENV_SINGLE_ARG_PARAMETER); + rpp->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or @@ -56,29 +56,29 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS); PortableServer::IdUniquenessPolicy_var iup = PortableServer::IdUniquenessPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::IdUniquenessPolicyValue id_uniqueness = - iup->value (TAO_ENV_SINGLE_ARG_PARAMETER); + iup->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policy = policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION); PortableServer::ImplicitActivationPolicy_var iap = PortableServer::ImplicitActivationPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ImplicitActivationPolicyValue implicit_activation = - iap->value (TAO_ENV_SINGLE_ARG_PARAMETER); + iap->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT); PortableServer::IdAssignmentPolicy_var idap = PortableServer::IdAssignmentPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::IdAssignmentPolicyValue id_assignment = - idap->value (TAO_ENV_SINGLE_ARG_PARAMETER); + idap->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -94,7 +94,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies ACE_THROW (PortableServer::POA::InvalidPolicy ()); #else /* TAO_HAS_MINIMUM_POA == 0 */ ACE_UNUSED_ARG (policies); - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_MINIMUM_POA == 0 */ } @@ -113,6 +113,6 @@ TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type) void TAO_POA_Default_Policy_Validator::merge_policies_impl (TAO_Policy_Set & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h index 5dcbf878594..873b830f335 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -41,11 +41,11 @@ protected: * if that is not the case. */ void validate_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Add/merge policies. void merge_policies_impl (TAO_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return whether the specified policy type is legal for the diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index b4aea740b64..8d837738eee 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -13,11 +13,11 @@ void TAO_Default_Servant_Dispatcher::dispatch ( TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_ServerRequest &req - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { servant_upcall.servant ()->_dispatch (req, &servant_upcall - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_POA * @@ -29,7 +29,7 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_POA *poa; @@ -42,7 +42,7 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name, thread_lock, orb_core, object_adapter - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index 339747a9645..0c4ac669529 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -40,7 +40,7 @@ public: /// Dispatch the request to the servant. virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_ServerRequest &req - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Factory method for creating new POA's. virtual TAO_POA *create_POA (const ACE_CString &name, @@ -51,7 +51,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; #include "ace/post.h" diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp index c86f002de75..78e69462db7 100644 --- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp +++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp @@ -20,11 +20,11 @@ TAO_Direct_Object_Proxy_Impl::~TAO_Direct_Object_Proxy_Impl (void) CORBA::Boolean TAO_Direct_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL ) + ACE_ENV_ARG_DECL ) { return target->_servant ()->_is_a (logical_type_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -32,13 +32,13 @@ TAO_Direct_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, CORBA::Boolean TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean _tao_retval = 0; ACE_TRY { if (target->_servant () != 0) - return target->_servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return target->_servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); // @@ Maybe we want to change this exception... ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); @@ -58,12 +58,12 @@ TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target CORBA_InterfaceDef_ptr TAO_Direct_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { if (target->_servant () != 0) - return target->_servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + return target->_servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); // @@ Maybe we want to change this exception... ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0); diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h index bb6927fdad3..1a9390437f2 100644 --- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h +++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h @@ -51,16 +51,16 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); #if (TAO_HAS_MINIMUM_CORBA == 0) virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA_InterfaceDef_ptr _get_interface ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/IORInfo.cpp b/TAO/tao/PortableServer/IORInfo.cpp index e8feb18d2fc..90753275567 100644 --- a/TAO/tao/PortableServer/IORInfo.cpp +++ b/TAO/tao/PortableServer/IORInfo.cpp @@ -25,7 +25,7 @@ TAO_IORInfo::~TAO_IORInfo (void) CORBA::Policy_ptr TAO_IORInfo::get_effective_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::PolicyList *policy_list = @@ -38,7 +38,7 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type { CORBA::PolicyType pt = (*policy_list)[i]->policy_type ( - TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); if (pt == type) @@ -55,7 +55,7 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type void TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Priyanka, why aren't you using the following: @@ -64,7 +64,7 @@ TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component // Add the given tagged component to all profiles. this->poa_->save_ior_component (component - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -72,7 +72,7 @@ void TAO_IORInfo::add_ior_component_to_profile ( const IOP::TaggedComponent &component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles matching the given @@ -83,26 +83,26 @@ TAO_IORInfo::add_ior_component_to_profile ( // ?!!!? this->poa_->save_ior_component_and_profile_id (component, profile_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableInterceptor::AdapterManagerId -TAO_IORInfo::manager_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->poa_->get_manager_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableInterceptor::AdapterState -TAO_IORInfo::state (TAO_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->poa_->get_adapter_state (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableInterceptor::ObjectReferenceTemplate * -TAO_IORInfo::adapter_template (TAO_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /* Returns Object Reference Template whenever an IOR Interceptor is @@ -125,7 +125,7 @@ TAO_IORInfo::adapter_template (TAO_ENV_SINGLE_ARG_DECL) } PortableInterceptor::ObjectReferenceFactory * -TAO_IORInfo::current_factory (TAO_ENV_SINGLE_ARG_DECL) +TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /* Returns the current_factory that is used to create the object @@ -143,17 +143,17 @@ TAO_IORInfo::current_factory (TAO_ENV_SINGLE_ARG_DECL) CORBA::COMPLETED_NO), 0); } - + return adapter_factory; } void TAO_IORInfo::current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->poa_->set_obj_ref_factory (current_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/PortableServer/IORInfo.h b/TAO/tao/PortableServer/IORInfo.h index 2477742fae7..4c399535dfb 100644 --- a/TAO/tao/PortableServer/IORInfo.h +++ b/TAO/tao/PortableServer/IORInfo.h @@ -62,21 +62,21 @@ public: TAO_IORInfo (TAO_ORB_Core *orb_core, TAO_POA *poa); - /* TAO_MProfile &mp, - CORBA::PolicyList *policy_list); + /* TAO_MProfile &mp, + CORBA::PolicyList *policy_list); */ /// Return the policy matching the given policy type that is in /// effect for the object whose IOR is being created. virtual CORBA::Policy_ptr get_effective_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles. virtual void add_ior_component ( const IOP::TaggedComponent & component - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles matching the given @@ -84,28 +84,28 @@ public: virtual void add_ior_component_to_profile ( const IOP::TaggedComponent & component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::AdapterManagerId manager_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::AdapterState state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::ObjectReferenceFactory * current_factory ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void current_factory ( PortableInterceptor::ObjectReferenceFactory * current_factory - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index b11c3aff750..039d9c077a7 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -150,10 +150,10 @@ ImplementationRepository::ServerObject_var::tao_nil (void) ::ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::ImplementationRepository::ServerObject::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -230,21 +230,21 @@ public: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -258,30 +258,30 @@ private: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::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_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::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; @@ -289,13 +289,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TA CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::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; @@ -307,21 +307,21 @@ public: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -335,30 +335,30 @@ private: TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::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_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::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; @@ -366,13 +366,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::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; @@ -394,7 +394,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -436,7 +436,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -452,7 +452,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -464,17 +464,17 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -490,7 +490,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -504,7 +504,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -514,12 +514,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -530,7 +530,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -546,7 +546,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -588,7 +588,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -604,7 +604,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -616,17 +616,17 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -642,7 +642,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -656,7 +656,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -666,12 +666,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -682,7 +682,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -737,7 +737,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::~_TAO_ServerObj ImplementationRepository::_TAO_ServerObject_Proxy_Impl& ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy ( ::ImplementationRepository::ServerObject * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -778,24 +778,24 @@ void ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_voi ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ServerObject::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0"TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0"ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ServerObject::_nil ()); if (is_a == 0) return ServerObject::_nil (); } - return ServerObject::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServerObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -864,14 +864,14 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj) return obj; } -CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type) @@ -896,36 +896,36 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo } void ImplementationRepository::ServerObject::ping ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ServerObject_Proxy_Impl &proxy = - this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.ping ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::ServerObject::shutdown ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ServerObject_Proxy_Impl &proxy = - this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.shutdown ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2144,10 +2144,10 @@ ImplementationRepository::Administration_var::tao_nil (void) ::ImplementationRepository::Administration_ptr ImplementationRepository::Administration_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::ImplementationRepository::Administration::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2225,21 +2225,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2255,19 +2255,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::T TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::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; @@ -2283,12 +2283,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::a } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2312,13 +2312,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::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; @@ -2332,21 +2332,21 @@ public: CORBA::Object_ptr _tao_target, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2364,7 +2364,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::T CORBA::Object_ptr _tao_target, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2372,12 +2372,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::T {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::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; @@ -2396,12 +2396,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::a } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2424,13 +2424,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::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; @@ -2444,21 +2444,21 @@ public: CORBA::Object_ptr _tao_target, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2476,7 +2476,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Object_ptr _tao_target, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2484,12 +2484,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::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; @@ -2508,12 +2508,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::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; @@ -2521,13 +2521,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::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; @@ -2540,21 +2540,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2570,19 +2570,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::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; @@ -2598,12 +2598,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arg } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2626,13 +2626,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::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; @@ -2645,21 +2645,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2675,19 +2675,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::T TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::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; @@ -2703,12 +2703,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::a } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2731,13 +2731,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::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; @@ -2752,21 +2752,21 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2788,7 +2788,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -2797,12 +2797,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::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; @@ -2824,12 +2824,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2852,13 +2852,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::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; @@ -2881,21 +2881,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -2911,19 +2911,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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,12 +2939,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2967,13 +2967,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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; @@ -2986,21 +2986,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3016,19 +3016,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRe TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_find::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; @@ -3044,12 +3044,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (T } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_find::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -3072,13 +3072,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions ( CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_find::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; @@ -3092,21 +3092,21 @@ public: CORBA::Object_ptr _tao_target, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -3124,7 +3124,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRe CORBA::Object_ptr _tao_target, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), how_many_ (how_many) @@ -3132,12 +3132,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRe {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_list::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; @@ -3154,12 +3154,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (T } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_list::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; @@ -3167,13 +3167,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions ( CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_Administration_list::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; @@ -3196,7 +3196,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administra void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3253,7 +3253,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3269,7 +3269,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3281,12 +3281,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3299,7 +3299,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3315,7 +3315,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3329,7 +3329,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3339,12 +3339,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -3355,7 +3355,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3373,7 +3373,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3426,7 +3426,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s _collocated_tao_target_, server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3442,7 +3442,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3454,12 +3454,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3473,7 +3473,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3489,7 +3489,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3503,7 +3503,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3513,12 +3513,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -3529,7 +3529,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3547,7 +3547,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3591,7 +3591,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister _collocated_tao_target_, server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3607,7 +3607,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3619,12 +3619,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3638,7 +3638,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3654,7 +3654,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3668,7 +3668,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3678,12 +3678,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -3694,7 +3694,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3711,7 +3711,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3763,7 +3763,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3779,7 +3779,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3791,12 +3791,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3809,7 +3809,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3825,7 +3825,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3839,7 +3839,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3849,12 +3849,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -3865,7 +3865,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3882,7 +3882,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3934,7 +3934,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3950,7 +3950,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3962,12 +3962,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3980,7 +3980,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3996,7 +3996,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4010,7 +4010,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4020,12 +4020,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -4036,7 +4036,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4055,7 +4055,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -4109,7 +4109,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -4125,7 +4125,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4137,12 +4137,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -4158,7 +4158,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4175,7 +4175,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4203,7 +4203,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4213,12 +4213,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -4229,7 +4229,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4246,7 +4246,7 @@ return _tao_safe_retval._retn (); void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -4298,7 +4298,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -4314,7 +4314,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4326,12 +4326,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4344,7 +4344,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4360,7 +4360,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4374,7 +4374,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4384,12 +4384,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -4400,7 +4400,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4418,7 +4418,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -4475,7 +4475,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( &_tao_call, _collocated_tao_target_, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -4491,7 +4491,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4503,12 +4503,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4521,7 +4521,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ); _invoke_status = - _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4537,7 +4537,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4561,7 +4561,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4571,12 +4571,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -4587,7 +4587,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4606,7 +4606,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4655,7 +4655,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( _collocated_tao_target_, how_many - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -4671,7 +4671,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4683,12 +4683,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4701,7 +4701,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -4717,7 +4717,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -4742,7 +4742,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -4752,12 +4752,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -4768,7 +4768,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -4823,7 +4823,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::~_TAO_Adminis ImplementationRepository::_TAO_Administration_Proxy_Impl& ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy ( ::ImplementationRepository::Administration * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -4864,24 +4864,24 @@ void ImplementationRepository::Administration::_tao_any_destructor (void *_tao_v ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return Administration::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0"TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0"ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Administration::_nil ()); if (is_a == 0) return Administration::_nil (); } - return Administration::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Administration::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4950,14 +4950,14 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj) return obj; } -CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type) @@ -5033,7 +5033,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_raise () void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -5046,7 +5046,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode ( void ImplementationRepository::Administration::AlreadyRegistered::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -5167,7 +5167,7 @@ void ImplementationRepository::Administration::CannotActivate::_raise () void ImplementationRepository::Administration::CannotActivate::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -5180,7 +5180,7 @@ void ImplementationRepository::Administration::CannotActivate::_tao_encode ( void ImplementationRepository::Administration::CannotActivate::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -5310,7 +5310,7 @@ void ImplementationRepository::Administration::NotFound::_raise () void ImplementationRepository::Administration::NotFound::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -5323,7 +5323,7 @@ void ImplementationRepository::Administration::NotFound::_tao_encode ( void ImplementationRepository::Administration::NotFound::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -5388,7 +5388,7 @@ CORBA::TypeCode_ptr ImplementationRepository::Administration::NotFound::_type (v void ImplementationRepository::Administration::activate_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5397,20 +5397,20 @@ void ImplementationRepository::Administration::activate_server ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.activate_server ( this, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5418,41 +5418,41 @@ void ImplementationRepository::Administration::register_server ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.register_server ( this, server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.reregister_server ( this, server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::remove_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5460,19 +5460,19 @@ void ImplementationRepository::Administration::remove_server ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.remove_server ( this, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::shutdown_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5480,13 +5480,13 @@ void ImplementationRepository::Administration::shutdown_server ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.shutdown_server ( this, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5494,7 +5494,7 @@ char * ImplementationRepository::Administration::server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5502,7 +5502,7 @@ char * ImplementationRepository::Administration::server_is_running ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.server_is_running ( @@ -5510,13 +5510,13 @@ char * ImplementationRepository::Administration::server_is_running ( server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5524,20 +5524,20 @@ void ImplementationRepository::Administration::server_is_shutting_down ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.server_is_shutting_down ( this, server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::Administration::find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -5545,14 +5545,14 @@ void ImplementationRepository::Administration::find ( )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.find ( this, server, info - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5560,14 +5560,14 @@ void ImplementationRepository::Administration::list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_Administration_Proxy_Impl &proxy = - this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.list ( @@ -5575,7 +5575,7 @@ void ImplementationRepository::Administration::list ( how_many, server_list, server_iterator - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -5726,10 +5726,10 @@ ImplementationRepository::ServerInformationIterator_var::tao_nil (void) ::ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::ImplementationRepository::ServerInformationIterator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5807,21 +5807,21 @@ public: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5839,19 +5839,19 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), how_many_ (how_many) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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; @@ -5867,12 +5867,12 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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; @@ -5880,13 +5880,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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; @@ -5908,21 +5908,21 @@ public: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -5936,30 +5936,30 @@ private: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_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_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_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; @@ -5967,13 +5967,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy CORBA::Any * -TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_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; @@ -5997,7 +5997,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6046,7 +6046,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P &_tao_call, _collocated_tao_target_, how_many - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -6062,7 +6062,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6074,12 +6074,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -6093,7 +6093,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ); _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6110,7 +6110,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6138,7 +6138,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6148,12 +6148,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -6164,7 +6164,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6180,7 +6180,7 @@ return _tao_retval; void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6222,7 +6222,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( &_tao_call, _collocated_tao_target_ - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -6238,7 +6238,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: { _tao_vfr.send_request ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6250,17 +6250,17 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( ACE_static_cast (CORBA::Octet, _tao_response_flag) - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; _invoke_status = - _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6276,7 +6276,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: ri.reply_status (_invoke_status); _tao_vfr.receive_other ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6290,7 +6290,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &ri - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6300,12 +6300,12 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -6316,7 +6316,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6371,7 +6371,7 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::~_ ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::select_proxy ( ::ImplementationRepository::ServerInformationIterator * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -6412,24 +6412,24 @@ void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (v ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return ServerInformationIterator::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0"TAO_ENV_ARG_PARAMETER); + CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0"ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ServerInformationIterator::_nil ()); if (is_a == 0) return ServerInformationIterator::_nil (); } - return ServerInformationIterator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServerInformationIterator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -6498,14 +6498,14 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati return obj; } -CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) +CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); + return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER); } void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type) @@ -6532,38 +6532,38 @@ const char* ImplementationRepository::ServerInformationIterator::_interface_repo CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ServerInformationIterator_Proxy_Impl &proxy = - this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.next_n ( this, how_many, server_list - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void ImplementationRepository::ServerInformationIterator::destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_ServerInformationIterator_Proxy_Impl &proxy = - this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); + this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; proxy.destroy ( this - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -6632,7 +6632,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository _tao_elem = ImplementationRepository::ServerObject::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6707,7 +6707,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6798,7 +6798,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6861,7 +6861,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6921,7 +6921,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7004,7 +7004,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7095,7 +7095,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7164,7 +7164,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository _tao_elem = ImplementationRepository::Administration::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7242,7 +7242,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7332,7 +7332,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7422,7 +7422,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7495,7 +7495,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository _tao_elem = ImplementationRepository::ServerInformationIterator::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -7556,7 +7556,7 @@ CORBA::Boolean operator>> ( _tao_objref = ImplementationRepository::ServerObject::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -7676,7 +7676,7 @@ CORBA::Boolean operator>> ( _tao_objref = ImplementationRepository::Administration::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -7712,7 +7712,7 @@ CORBA::Boolean operator>> ( _tao_objref = ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( obj.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index 83789055066..19239e80f9b 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -104,7 +104,7 @@ TAO_NAMESPACE ImplementationRepository static ServerObject_ptr tao_nil (void); static ServerObject_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -168,12 +168,12 @@ TAO_NAMESPACE ImplementationRepository static ServerObject_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerObject_ptr _nil (void) @@ -184,14 +184,14 @@ TAO_NAMESPACE ImplementationRepository static void _tao_any_destructor (void*); virtual void ping ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void shutdown ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -199,7 +199,7 @@ TAO_NAMESPACE ImplementationRepository virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -249,7 +249,7 @@ TAO_NAMESPACE ImplementationRepository virtual ~_TAO_ServerObject_Proxy_Impl (void) { } virtual void ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -257,7 +257,7 @@ TAO_NAMESPACE ImplementationRepository virtual void shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -287,7 +287,7 @@ TAO_NAMESPACE ImplementationRepository virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { } virtual void ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -295,7 +295,7 @@ TAO_NAMESPACE ImplementationRepository virtual void shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -324,7 +324,7 @@ TAO_NAMESPACE ImplementationRepository virtual ~_TAO_ServerObject_Proxy_Broker (void); virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( ServerObject *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -351,7 +351,7 @@ TAO_NAMESPACE ImplementationRepository virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( ServerObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -961,7 +961,7 @@ TAO_NAMESPACE ImplementationRepository static ServerInformationIterator_ptr tao_nil (void); static ServerInformationIterator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1040,7 +1040,7 @@ TAO_NAMESPACE ImplementationRepository static Administration_ptr tao_nil (void); static Administration_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1104,12 +1104,12 @@ TAO_NAMESPACE ImplementationRepository static Administration_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Administration_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static Administration_ptr _nil (void) @@ -1144,12 +1144,12 @@ TAO_NAMESPACE ImplementationRepository virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AlreadyRegistered *_downcast (CORBA::Exception *); @@ -1191,12 +1191,12 @@ static CORBA::TypeCode_ptr _tc_AlreadyRegistered; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CannotActivate *_downcast (CORBA::Exception *); @@ -1240,12 +1240,12 @@ static CORBA::TypeCode_ptr _tc_CannotActivate; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NotFound *_downcast (CORBA::Exception *); @@ -1263,7 +1263,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void activate_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1274,7 +1274,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1284,7 +1284,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1292,7 +1292,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void remove_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1301,7 +1301,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void shutdown_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1312,7 +1312,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1321,7 +1321,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1331,7 +1331,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1342,7 +1342,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1350,7 +1350,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1401,7 +1401,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1413,7 +1413,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1424,7 +1424,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1433,7 +1433,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1443,7 +1443,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1455,7 +1455,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1465,7 +1465,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1476,7 +1476,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1488,7 +1488,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1519,7 +1519,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1531,7 +1531,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1542,7 +1542,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1551,7 +1551,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1561,7 +1561,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1573,7 +1573,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1583,7 +1583,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1594,7 +1594,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1606,7 +1606,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1635,7 +1635,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual ~_TAO_Administration_Proxy_Broker (void); virtual _TAO_Administration_Proxy_Impl &select_proxy ( Administration *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1662,7 +1662,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual _TAO_Administration_Proxy_Impl &select_proxy ( Administration *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -1710,12 +1710,12 @@ static CORBA::TypeCode_ptr _tc_NotFound; static ServerInformationIterator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerInformationIterator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static ServerInformationIterator_ptr _nil (void) @@ -1728,14 +1728,14 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -1743,7 +1743,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1795,7 +1795,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1803,7 +1803,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1835,7 +1835,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1843,7 +1843,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1872,7 +1872,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void); virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( ServerInformationIterator *object - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; protected: @@ -1899,7 +1899,7 @@ static CORBA::TypeCode_ptr _tc_NotFound; virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( ServerInformationIterator *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i index a5339a82670..38a7ee435f5 100644 --- a/TAO/tao/PortableServer/ImplRepoC.i +++ b/TAO/tao/PortableServer/ImplRepoC.i @@ -50,10 +50,10 @@ tao_ImplementationRepository_ServerObject_nil ( ACE_INLINE ImplementationRepository::ServerObject_ptr tao_ImplementationRepository_ServerObject_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ImplementationRepository::ServerObject::_narrow (p TAO_ENV_ARG_PARAMETER); + return ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1490,10 +1490,10 @@ tao_ImplementationRepository_Administration_nil ( ACE_INLINE ImplementationRepository::Administration_ptr tao_ImplementationRepository_Administration_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ImplementationRepository::Administration::_narrow (p TAO_ENV_ARG_PARAMETER); + return ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1551,10 +1551,10 @@ tao_ImplementationRepository_ServerInformationIterator_nil ( ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr tao_ImplementationRepository_ServerInformationIterator_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ImplementationRepository::ServerInformationIterator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp index b5c96026e3c..137f40dfade 100644 --- a/TAO/tao/PortableServer/ImplRepoS.cpp +++ b/TAO/tao/PortableServer/ImplRepoS.cpp @@ -160,31 +160,31 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *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)); @@ -201,31 +201,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerObject *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_ImplementationRepository_ServerObject_ping::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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_ImplementationRepository_ServerObject_ping::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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; @@ -233,13 +233,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TA CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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; @@ -247,7 +247,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_EN char * TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -257,10 +257,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_de CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo @@ -269,31 +269,31 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *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)); @@ -310,31 +310,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_Server TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerObject *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_ImplementationRepository_ServerObject_shutdown::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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_ImplementationRepository_ServerObject_shutdown::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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; @@ -342,13 +342,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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; @@ -356,7 +356,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TA char * TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -366,10 +366,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_mos CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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 */ @@ -402,17 +402,17 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ ImplementationRepository::_TAO_ServerObject_Proxy_Impl& POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select_proxy ( ::ImplementationRepository::ServerObject *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]; @@ -422,7 +422,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select void POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -501,7 +501,7 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerO void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -515,7 +515,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping ( _collocated_tao_target_->_object_key (), "ping", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -524,14 +524,14 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping ( "IDL:ImplementationRepository/ServerObject:1.0" ) )->ping ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -545,7 +545,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow _collocated_tao_target_->_object_key (), "shutdown", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -554,7 +554,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow "IDL:ImplementationRepository/ServerObject:1.0" ) )->shutdown ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -573,7 +573,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerOb void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -583,14 +583,14 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping ( POA_ImplementationRepository::ServerObject_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0") )->ping ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -600,7 +600,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown POA_ImplementationRepository::ServerObject_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0") )->shutdown ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -629,7 +629,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = @@ -650,24 +650,24 @@ void POA_ImplementationRepository::ServerObject::ping_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->ping ( - 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 @@ -675,12 +675,12 @@ void POA_ImplementationRepository::ServerObject::ping_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 @@ -701,7 +701,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = @@ -722,24 +722,24 @@ void POA_ImplementationRepository::ServerObject::shutdown_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->shutdown ( - 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 @@ -747,12 +747,12 @@ void POA_ImplementationRepository::ServerObject::shutdown_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 @@ -773,7 +773,7 @@ void POA_ImplementationRepository::ServerObject::_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 (); @@ -783,7 +783,7 @@ void POA_ImplementationRepository::ServerObject::_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 (); @@ -796,11 +796,11 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _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 (); @@ -813,7 +813,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; @@ -832,7 +832,7 @@ void POA_ImplementationRepository::ServerObject::_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 (); @@ -859,10 +859,10 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::ServerObject::_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 ( @@ -884,12 +884,12 @@ void* POA_ImplementationRepository::ServerObject::_downcast ( return 0; } -void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_ImplementationRepository::ServerObject::_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); } @@ -899,9 +899,9 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id } ImplementationRepository::ServerObject* -POA_ImplementationRepository::ServerObject::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::ServerObject::_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); @@ -1045,31 +1045,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - 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)); @@ -1088,7 +1088,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1096,12 +1096,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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; @@ -1117,12 +1117,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::a } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1146,13 +1146,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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; @@ -1160,7 +1160,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::r char * TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1170,10 +1170,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::t CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo @@ -1185,31 +1185,31 @@ public: , const char * server, const ImplementationRepository::StartupOptions & options - 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)); @@ -1230,7 +1230,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T POA_ImplementationRepository::Administration *tao_impl, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1239,12 +1239,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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; @@ -1263,12 +1263,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::a } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1291,13 +1291,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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; @@ -1305,7 +1305,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::r char * TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1315,10 +1315,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::t CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo @@ -1330,31 +1330,31 @@ public: , const char * server, const ImplementationRepository::StartupOptions & options - 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)); @@ -1375,7 +1375,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: POA_ImplementationRepository::Administration *tao_impl, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1384,12 +1384,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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; @@ -1408,12 +1408,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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; @@ -1421,13 +1421,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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; @@ -1435,7 +1435,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: char * TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1445,10 +1445,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo @@ -1459,31 +1459,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - 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)); @@ -1502,7 +1502,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1510,12 +1510,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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; @@ -1531,12 +1531,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arg } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1559,13 +1559,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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; @@ -1573,7 +1573,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::res char * TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1583,10 +1583,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::tar CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo @@ -1597,31 +1597,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - 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)); @@ -1640,7 +1640,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1648,12 +1648,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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; @@ -1669,12 +1669,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::a } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1697,13 +1697,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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; @@ -1711,7 +1711,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::r char * TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1721,10 +1721,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::t CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo @@ -1737,31 +1737,31 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - 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); @@ -1785,7 +1785,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1795,12 +1795,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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; @@ -1822,12 +1822,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1850,13 +1850,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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; @@ -1868,7 +1868,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: char * TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1878,10 +1878,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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 @@ -1899,31 +1899,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - 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)); @@ -1942,7 +1942,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1950,12 +1950,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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; @@ -1971,12 +1971,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -1999,13 +1999,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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; @@ -2013,7 +2013,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting char * TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2023,10 +2023,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo @@ -2037,31 +2037,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl , const char * server - 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)); @@ -2080,7 +2080,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const char * server - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2088,12 +2088,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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; @@ -2109,12 +2109,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (T } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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); Dynamic::ExceptionList_var safe_exception_list = exception_list; @@ -2137,13 +2137,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions ( CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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; @@ -2151,7 +2151,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (TAO_ char * TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2161,10 +2161,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_ CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo @@ -2176,31 +2176,31 @@ public: , const CORBA::ULong & how_many - 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)); @@ -2220,7 +2220,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::Administration *tao_impl, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2229,12 +2229,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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; @@ -2251,12 +2251,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (T } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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; @@ -2264,13 +2264,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions ( CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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; @@ -2278,7 +2278,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (TAO_ char * TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2288,10 +2288,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_ CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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 */ @@ -2324,17 +2324,17 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TA ImplementationRepository::_TAO_Administration_Proxy_Impl& POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::select_proxy ( ::ImplementationRepository::Administration *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]; @@ -2344,7 +2344,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::sele void POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -2424,7 +2424,7 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2440,7 +2440,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ _collocated_tao_target_->_object_key (), "activate_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2450,7 +2450,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ ) )->activate_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2459,7 +2459,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2474,7 +2474,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis _collocated_tao_target_->_object_key (), "register_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2485,7 +2485,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis )->register_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2494,7 +2494,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2508,7 +2508,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg _collocated_tao_target_->_object_key (), "reregister_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2519,7 +2519,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg )->reregister_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2527,7 +2527,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2542,7 +2542,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov _collocated_tao_target_->_object_key (), "remove_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2552,7 +2552,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov ) )->remove_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2560,7 +2560,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2575,7 +2575,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd _collocated_tao_target_->_object_key (), "shutdown_server", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2585,7 +2585,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd ) )->shutdown_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2595,7 +2595,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2612,7 +2612,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser _collocated_tao_target_->_object_key (), "server_is_running", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2624,14 +2624,14 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2646,7 +2646,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve _collocated_tao_target_->_object_key (), "server_is_shutting_down", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2656,7 +2656,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve ) )->server_is_shutting_down ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2665,7 +2665,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2680,7 +2680,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find _collocated_tao_target_->_object_key (), "find", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2691,7 +2691,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find )->find ( server, info - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2701,7 +2701,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2715,7 +2715,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list _collocated_tao_target_->_object_key (), "list", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2727,7 +2727,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list how_many, server_list, server_iterator - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -2747,7 +2747,7 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Admini void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2760,7 +2760,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->activate_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2769,7 +2769,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2782,7 +2782,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist )->register_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2791,7 +2791,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2803,7 +2803,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi )->reregister_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2811,7 +2811,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2823,7 +2823,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->remove_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2831,7 +2831,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2843,7 +2843,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->shutdown_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2853,7 +2853,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2867,7 +2867,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2875,7 +2875,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2887,7 +2887,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0") )->server_is_shutting_down ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2896,7 +2896,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -2909,7 +2909,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find )->find ( server, info - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2919,7 +2919,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2932,7 +2932,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list how_many, server_list, server_iterator - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -2961,7 +2961,7 @@ void POA_ImplementationRepository::Administration::activate_server_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 (); @@ -2990,25 +2990,25 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( _tao_upcall, _tao_impl, server.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->activate_server ( server.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 @@ -3016,12 +3016,12 @@ void POA_ImplementationRepository::Administration::activate_server_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 @@ -3042,7 +3042,7 @@ void POA_ImplementationRepository::Administration::register_server_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 (); @@ -3074,12 +3074,12 @@ void POA_ImplementationRepository::Administration::register_server_skel ( _tao_impl, server.in (), options - 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 */ @@ -3087,13 +3087,13 @@ void POA_ImplementationRepository::Administration::register_server_skel ( _tao_impl->register_server ( server.in (), options - 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 @@ -3101,12 +3101,12 @@ void POA_ImplementationRepository::Administration::register_server_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 @@ -3127,7 +3127,7 @@ void POA_ImplementationRepository::Administration::reregister_server_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 (); @@ -3159,12 +3159,12 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( _tao_impl, server.in (), options - 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 */ @@ -3172,13 +3172,13 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( _tao_impl->reregister_server ( server.in (), options - 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 @@ -3186,12 +3186,12 @@ void POA_ImplementationRepository::Administration::reregister_server_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 @@ -3212,7 +3212,7 @@ void POA_ImplementationRepository::Administration::remove_server_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 (); @@ -3241,25 +3241,25 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( _tao_upcall, _tao_impl, server.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->remove_server ( server.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 @@ -3267,12 +3267,12 @@ void POA_ImplementationRepository::Administration::remove_server_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 @@ -3293,7 +3293,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_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 (); @@ -3322,25 +3322,25 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( _tao_upcall, _tao_impl, server.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->shutdown_server ( server.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 @@ -3348,12 +3348,12 @@ void POA_ImplementationRepository::Administration::shutdown_server_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 @@ -3374,7 +3374,7 @@ void POA_ImplementationRepository::Administration::server_is_running_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 (); @@ -3409,12 +3409,12 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( server.in (), addr.in (), server_object.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 */ @@ -3423,7 +3423,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( server.in (), addr.in (), server_object.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3432,7 +3432,7 @@ void POA_ImplementationRepository::Administration::server_is_running_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 @@ -3440,12 +3440,12 @@ void POA_ImplementationRepository::Administration::server_is_running_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 @@ -3473,7 +3473,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_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 (); @@ -3502,25 +3502,25 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel _tao_upcall, _tao_impl, server.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->server_is_shutting_down ( server.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 @@ -3528,12 +3528,12 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_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 @@ -3554,7 +3554,7 @@ void POA_ImplementationRepository::Administration::find_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 (); @@ -3583,12 +3583,12 @@ void POA_ImplementationRepository::Administration::find_skel ( _tao_upcall, _tao_impl, server.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 */ @@ -3596,13 +3596,13 @@ void POA_ImplementationRepository::Administration::find_skel ( _tao_impl->find ( server.in (), info.out () - 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 @@ -3610,12 +3610,12 @@ void POA_ImplementationRepository::Administration::find_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 @@ -3643,7 +3643,7 @@ void POA_ImplementationRepository::Administration::list_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 (); @@ -3674,12 +3674,12 @@ void POA_ImplementationRepository::Administration::list_skel ( _tao_impl, how_many - 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 */ @@ -3688,13 +3688,13 @@ void POA_ImplementationRepository::Administration::list_skel ( how_many, server_list.out (), server_iterator.out () - 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 @@ -3702,12 +3702,12 @@ void POA_ImplementationRepository::Administration::list_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 @@ -3736,7 +3736,7 @@ void POA_ImplementationRepository::Administration::_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 (); @@ -3746,7 +3746,7 @@ void POA_ImplementationRepository::Administration::_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 (); @@ -3759,11 +3759,11 @@ void POA_ImplementationRepository::Administration::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _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 (); @@ -3776,7 +3776,7 @@ void POA_ImplementationRepository::Administration::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; @@ -3795,7 +3795,7 @@ void POA_ImplementationRepository::Administration::_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 (); @@ -3822,10 +3822,10 @@ void POA_ImplementationRepository::Administration::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::Administration::_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 ( @@ -3847,12 +3847,12 @@ void* POA_ImplementationRepository::Administration::_downcast ( return 0; } -void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_ImplementationRepository::Administration::_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); } @@ -3862,9 +3862,9 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_ } ImplementationRepository::Administration* -POA_ImplementationRepository::Administration::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::Administration::_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); @@ -3998,31 +3998,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl , const CORBA::ULong & how_many - 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); @@ -4042,7 +4042,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerInformationIterator *tao_impl, const CORBA::ULong & how_many - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4050,12 +4050,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: {} Dynamic::ParameterList * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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; @@ -4071,12 +4071,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: } Dynamic::ExceptionList * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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; @@ -4084,13 +4084,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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; @@ -4102,7 +4102,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: char * TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4112,10 +4112,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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 @@ -4131,31 +4131,31 @@ public: TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *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)); @@ -4172,31 +4172,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_ImplementationRepository::ServerInformationIterator *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_ImplementationRepository_ServerInformationIterator_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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_ImplementationRepository_ServerInformationIterator_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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; @@ -4204,13 +4204,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy CORBA::Any * -TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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; @@ -4218,7 +4218,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy char * TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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 @@ -4228,10 +4228,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy CORBA::Boolean TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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 */ @@ -4264,17 +4264,17 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::select_proxy ( ::ImplementationRepository::ServerInformationIterator *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]; @@ -4284,7 +4284,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B void POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -4365,7 +4365,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4381,7 +4381,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru _collocated_tao_target_->_object_key (), "next_n", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -4392,13 +4392,13 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru )->next_n ( how_many, server_list - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4412,7 +4412,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_ _collocated_tao_target_->_object_key (), "destroy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -4421,7 +4421,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_ "IDL:ImplementationRepository/ServerInformationIterator:1.0" ) )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -4442,7 +4442,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4454,14 +4454,14 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire )->next_n ( how_many, server_list - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -4471,7 +4471,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_I POA_ImplementationRepository::ServerInformationIterator_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0") )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -4500,7 +4500,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_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 (); @@ -4530,12 +4530,12 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( _tao_upcall, _tao_impl, how_many - 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 */ @@ -4543,7 +4543,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( _tao_impl->next_n ( how_many, server_list.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -4551,7 +4551,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_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 @@ -4559,12 +4559,12 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_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 @@ -4593,7 +4593,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = @@ -4614,24 +4614,24 @@ void POA_ImplementationRepository::ServerInformationIterator::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 @@ -4639,12 +4639,12 @@ void POA_ImplementationRepository::ServerInformationIterator::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 @@ -4665,7 +4665,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_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 (); @@ -4675,7 +4675,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_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 (); @@ -4688,11 +4688,11 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _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 (); @@ -4705,7 +4705,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; @@ -4724,7 +4724,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_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 (); @@ -4751,10 +4751,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_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 ( @@ -4776,12 +4776,12 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast ( return 0; } -void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_ImplementationRepository::ServerInformationIterator::_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); } @@ -4791,9 +4791,9 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_ } ImplementationRepository::ServerInformationIterator* -POA_ImplementationRepository::ServerInformationIterator::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::ServerInformationIterator::_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/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h index 0926dcc5a9f..136d8d42c82 100644 --- a/TAO/tao/PortableServer/ImplRepoS.h +++ b/TAO/tao/PortableServer/ImplRepoS.h @@ -68,7 +68,7 @@ TAO_NAMESPACE POA_ImplementationRepository 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 ( @@ -79,37 +79,37 @@ TAO_NAMESPACE POA_ImplementationRepository 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 ); ::ImplementationRepository::ServerObject *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual void ping ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -119,11 +119,11 @@ TAO_NAMESPACE POA_ImplementationRepository TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void shutdown ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -133,7 +133,7 @@ TAO_NAMESPACE POA_ImplementationRepository TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -153,7 +153,7 @@ TAO_NAMESPACE POA_ImplementationRepository virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy ( ::ImplementationRepository::ServerObject *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -161,7 +161,7 @@ TAO_NAMESPACE POA_ImplementationRepository // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -200,7 +200,7 @@ TAO_NAMESPACE POA_ImplementationRepository virtual void ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -208,7 +208,7 @@ TAO_NAMESPACE POA_ImplementationRepository virtual void shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -237,7 +237,7 @@ public: virtual void ping ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -245,7 +245,7 @@ public: virtual void shutdown ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -279,7 +279,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 ( @@ -290,38 +290,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 ); ::ImplementationRepository::Administration *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; virtual void activate_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -333,13 +333,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -350,13 +350,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -366,12 +366,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void remove_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -382,12 +382,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void shutdown_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -398,14 +398,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual char * server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -416,12 +416,12 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -432,13 +432,13 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -449,14 +449,14 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual void list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -466,7 +466,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -486,7 +486,7 @@ public: virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy ( ::ImplementationRepository::Administration *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -494,7 +494,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -534,7 +534,7 @@ public: virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -546,7 +546,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -557,7 +557,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -566,7 +566,7 @@ public: virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -576,7 +576,7 @@ public: virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -588,7 +588,7 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -598,7 +598,7 @@ public: virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -609,7 +609,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -621,7 +621,7 @@ public: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -651,7 +651,7 @@ public: virtual void activate_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -663,7 +663,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -674,7 +674,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -683,7 +683,7 @@ public: virtual void remove_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -693,7 +693,7 @@ public: virtual void shutdown_server ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -705,7 +705,7 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -715,7 +715,7 @@ public: virtual void server_is_shutting_down ( CORBA_Object *_collocated_tao_target_, const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -726,7 +726,7 @@ public: CORBA_Object *_collocated_tao_target_, const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -738,7 +738,7 @@ public: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -772,7 +772,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 ( @@ -783,31 +783,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 ); ::ImplementationRepository::ServerInformationIterator *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -815,7 +815,7 @@ public: virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -825,11 +825,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 @@ -839,7 +839,7 @@ public: TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -859,7 +859,7 @@ public: virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( ::ImplementationRepository::ServerInformationIterator *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -867,7 +867,7 @@ private: // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -908,7 +908,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -916,7 +916,7 @@ public: virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -947,7 +947,7 @@ public: CORBA_Object *_collocated_tao_target_, CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -955,7 +955,7 @@ public: virtual void destroy ( CORBA_Object *_collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h index 82456cc70ec..676cbf18c73 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.h +++ b/TAO/tao/PortableServer/ImplRepoS_T.h @@ -63,17 +63,17 @@ TAO_NAMESPACE POA_ImplementationRepository // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); void ping ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); void shutdown ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -119,11 +119,11 @@ TAO_NAMESPACE POA_ImplementationRepository // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); void activate_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -134,7 +134,7 @@ TAO_NAMESPACE POA_ImplementationRepository void register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -144,7 +144,7 @@ TAO_NAMESPACE POA_ImplementationRepository void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -152,7 +152,7 @@ TAO_NAMESPACE POA_ImplementationRepository void remove_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -161,7 +161,7 @@ TAO_NAMESPACE POA_ImplementationRepository void shutdown_server ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -172,7 +172,7 @@ TAO_NAMESPACE POA_ImplementationRepository const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -181,7 +181,7 @@ TAO_NAMESPACE POA_ImplementationRepository void server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -191,7 +191,7 @@ TAO_NAMESPACE POA_ImplementationRepository void find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -202,7 +202,7 @@ TAO_NAMESPACE POA_ImplementationRepository CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -248,19 +248,19 @@ TAO_NAMESPACE POA_ImplementationRepository // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_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/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i index f821198e58b..dc5b9eae4e1 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.i +++ b/TAO/tao/PortableServer/ImplRepoS_T.i @@ -90,37 +90,37 @@ POA_ImplementationRepository::ServerObject_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::ServerObject_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->ServerObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ServerObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE void POA_ImplementationRepository::ServerObject_tie<T>::ping ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->ping ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::ServerObject_tie<T>::shutdown ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { this->ptr_->shutdown ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -197,18 +197,18 @@ POA_ImplementationRepository::Administration_tie<T>::_is_owner (CORBA::Boolean b } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::Administration_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::Administration_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->Administration::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->Administration::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::activate_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -218,7 +218,7 @@ void POA_ImplementationRepository::Administration_tie<T>::activate_server ( { this->ptr_->activate_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -226,7 +226,7 @@ template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::register_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -236,7 +236,7 @@ void POA_ImplementationRepository::Administration_tie<T>::register_server ( this->ptr_->register_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -244,7 +244,7 @@ template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -253,14 +253,14 @@ void POA_ImplementationRepository::Administration_tie<T>::reregister_server ( this->ptr_->reregister_server ( server, options - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::remove_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -269,14 +269,14 @@ void POA_ImplementationRepository::Administration_tie<T>::remove_server ( { this->ptr_->remove_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::shutdown_server ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -285,7 +285,7 @@ void POA_ImplementationRepository::Administration_tie<T>::shutdown_server ( { this->ptr_->shutdown_server ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -294,7 +294,7 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running ( const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -305,14 +305,14 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running ( server, addr, server_object - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_down ( const char * server - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -321,7 +321,7 @@ void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_dow { this->ptr_->server_is_shutting_down ( server - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -329,7 +329,7 @@ template <class T> ACE_INLINE void POA_ImplementationRepository::Administration_tie<T>::find ( const char * server, ImplementationRepository::ServerInformation_out info - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -339,7 +339,7 @@ void POA_ImplementationRepository::Administration_tie<T>::find ( this->ptr_->find ( server, info - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -348,7 +348,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -358,7 +358,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list ( how_many, server_list, server_iterator - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -435,19 +435,19 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::_is_owner (CORBA } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_ImplementationRepository::ServerInformationIterator_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->ServerInformationIterator::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ServerInformationIterator::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -456,20 +456,20 @@ CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::n return this->ptr_->next_n ( how_many, server_list - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_ImplementationRepository::ServerInformationIterator_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/tao/PortableServer/ImplRepo_i.cpp b/TAO/tao/PortableServer/ImplRepo_i.cpp index 492bea49049..4de7a2ece9e 100644 --- a/TAO/tao/PortableServer/ImplRepo_i.cpp +++ b/TAO/tao/PortableServer/ImplRepo_i.cpp @@ -17,21 +17,21 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb, } void -ServerObject_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerObject_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -ServerObject_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +ServerObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_ptr -ServerObject_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tao/PortableServer/ImplRepo_i.h b/TAO/tao/PortableServer/ImplRepo_i.h index c81aa13f92c..cf598c71b65 100644 --- a/TAO/tao/PortableServer/ImplRepo_i.h +++ b/TAO/tao/PortableServer/ImplRepo_i.h @@ -41,15 +41,15 @@ public: PortableServer::POA_ptr poa); /// Ping method. - void ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the server. - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns the default POA for this servant. - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); protected: /// Our ORB. We need this member in case we need to shutdown the diff --git a/TAO/tao/PortableServer/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp index eda6af66a2d..0c1aa75efb2 100644 --- a/TAO/tao/PortableServer/MessagingS.cpp +++ b/TAO/tao/PortableServer/MessagingS.cpp @@ -186,17 +186,17 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::~_TAO_ReplyHandler_St Messaging::_TAO_ReplyHandler_Proxy_Impl& POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy ( ::Messaging::ReplyHandler *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]; @@ -206,7 +206,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy ( void POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -319,7 +319,7 @@ void POA_Messaging::ReplyHandler::_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 (); @@ -329,7 +329,7 @@ void POA_Messaging::ReplyHandler::_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 (); @@ -342,11 +342,11 @@ void POA_Messaging::ReplyHandler::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _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 (); @@ -359,7 +359,7 @@ void POA_Messaging::ReplyHandler::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_object_reference; @@ -378,7 +378,7 @@ void POA_Messaging::ReplyHandler::_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 (); @@ -405,10 +405,10 @@ void POA_Messaging::ReplyHandler::_interface_skel ( CORBA::Boolean POA_Messaging::ReplyHandler::_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 ( @@ -430,12 +430,12 @@ void* POA_Messaging::ReplyHandler::_downcast ( return 0; } -void POA_Messaging::ReplyHandler::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_Messaging::ReplyHandler::_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); } const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const @@ -444,9 +444,9 @@ const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const } Messaging::ReplyHandler* -POA_Messaging::ReplyHandler::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_Messaging::ReplyHandler::_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/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h index eb2af498df8..08763f1c1cf 100644 --- a/TAO/tao/PortableServer/MessagingS.h +++ b/TAO/tao/PortableServer/MessagingS.h @@ -76,7 +76,7 @@ TAO_NAMESPACE POA_Messaging 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 ( @@ -87,31 +87,31 @@ TAO_NAMESPACE POA_Messaging 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 ); ::Messaging::ReplyHandler *_this ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual const char* _interface_repository_id (void) const; @@ -133,7 +133,7 @@ TAO_NAMESPACE POA_Messaging virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl &select_proxy ( ::Messaging::ReplyHandler *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -142,7 +142,7 @@ TAO_NAMESPACE POA_Messaging // 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/tao/PortableServer/MessagingS_T.h b/TAO/tao/PortableServer/MessagingS_T.h index 5e44a56a7a3..95eafa8c5d8 100644 --- a/TAO/tao/PortableServer/MessagingS_T.h +++ b/TAO/tao/PortableServer/MessagingS_T.h @@ -49,7 +49,7 @@ TAO_NAMESPACE POA_Messaging // ctor with T*, ownership flag and a POA ~ReplyHandler_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -61,16 +61,16 @@ TAO_NAMESPACE POA_Messaging // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed ReplyHandler_tie (const ReplyHandler_tie &); void operator= (const ReplyHandler_tie &); diff --git a/TAO/tao/PortableServer/MessagingS_T.i b/TAO/tao/PortableServer/MessagingS_T.i index 84f75442fea..6dad8a7e540 100644 --- a/TAO/tao/PortableServer/MessagingS_T.i +++ b/TAO/tao/PortableServer/MessagingS_T.i @@ -23,30 +23,30 @@ template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE @@ -90,12 +90,12 @@ POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_Messaging::ReplyHandler_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_Messaging::ReplyHandler_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->ReplyHandler::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } #endif /* ACE_HAS_USING_KEYWORD */ diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp index 752ac45da94..9dcf1405533 100644 --- a/TAO/tao/PortableServer/ORB_Manager.cpp +++ b/TAO/tao/PortableServer/ORB_Manager.cpp @@ -28,26 +28,26 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb, int TAO_ORB_Manager::init (int &argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return this->init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int TAO_ORB_Manager::init (int &argc, char **argv, const char *orb_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->orb_.in ())) { this->orb_ = CORBA::ORB_init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -56,7 +56,7 @@ TAO_ORB_Manager::init (int &argc, // Get the POA from the ORB. CORBA::Object_var poa_object = this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (poa_object.in ())) @@ -67,7 +67,7 @@ TAO_ORB_Manager::init (int &argc, // Get the POA object. this->poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -76,7 +76,7 @@ TAO_ORB_Manager::init (int &argc, { // Get the POA_Manager. this->poa_manager_ = - this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -88,13 +88,13 @@ int TAO_ORB_Manager::init_child_poa (int& argc, char **argv, const char *poa_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return this->init_child_poa (argc, argv, poa_name, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int @@ -102,7 +102,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, char **argv, const char *poa_name, const char *orb_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int init_result; @@ -110,7 +110,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, init_result = this->init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (init_result == -1) @@ -126,13 +126,13 @@ TAO_ORB_Manager::init_child_poa (int& argc, // Id Assignment policy policies[0] = this->poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Lifespan policy policies[1] = this->poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We use a different POA, otherwise the user would have to change @@ -142,7 +142,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, this->poa_->create_POA (poa_name, this->poa_manager_.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Warning! If create_POA fails, then the policies won't be // destroyed and there will be hell to pay in memory leaks! ACE_CHECK_RETURN (-1); @@ -153,7 +153,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, ++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); } return 0; @@ -162,9 +162,9 @@ TAO_ORB_Manager::init_child_poa (int& argc, // Activate POA manager. int -TAO_ORB_Manager::activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL) { - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } @@ -173,21 +173,21 @@ TAO_ORB_Manager::activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ORB_Manager::activate (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var id = this->poa_->activate_object (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = this->poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var str = this->orb_->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return str._retn (); @@ -195,20 +195,20 @@ TAO_ORB_Manager::activate (PortableServer::Servant servant void TAO_ORB_Manager::deactivate (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->orb_->string_to_object (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var object_id = this->poa_->reference_to_id (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_->deactivate_object (object_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // Activate the object with the object_name under the child POA. @@ -216,7 +216,7 @@ TAO_ORB_Manager::deactivate (const char *id char * TAO_ORB_Manager::activate_under_child_poa (const char *object_name, PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (object_name == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -229,17 +229,17 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name, this->child_poa_->activate_object_with_id (id.in (), servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = this->child_poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); char * str = this->orb_->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -248,46 +248,46 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name, void TAO_ORB_Manager::deactivate_under_child_poa (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->orb_->string_to_object (id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var object_id = this->child_poa_->reference_to_id (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->child_poa_->deactivate_object (object_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // Enter the ORB event loop. int TAO_ORB_Manager::run (ACE_Time_Value &tv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->orb_->run (tv TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -TAO_ORB_Manager::fini (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::fini (ACE_ENV_SINGLE_ARG_DECL) { - this->poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->poa_ = 0; - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->orb_ = 0; @@ -295,12 +295,12 @@ TAO_ORB_Manager::fini (TAO_ENV_SINGLE_ARG_DECL) } int -TAO_ORB_Manager::run (TAO_ENV_SINGLE_ARG_DECL) +TAO_ORB_Manager::run (ACE_ENV_SINGLE_ARG_DECL) { - this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -344,7 +344,7 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void) { this->poa_->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tao/PortableServer/ORB_Manager.h b/TAO/tao/PortableServer/ORB_Manager.h index 7420662f37e..034708f4f11 100644 --- a/TAO/tao/PortableServer/ORB_Manager.h +++ b/TAO/tao/PortableServer/ORB_Manager.h @@ -64,7 +64,7 @@ public: */ int init (int &argc, char *argv[] - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Initialize the ORB/root POA, using the supplied command line * arguments or the default ORB components. @@ -74,7 +74,7 @@ public: int init (int &argc, char *argv[], const char *orb_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Creates a child poa under the root poa with PERSISTENT and @@ -86,7 +86,7 @@ public: int init_child_poa (int &argc, char *argv[], const char *poa_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Creates a child poa under the root poa with PERSISTENT and @@ -97,13 +97,13 @@ public: char *argv[], const char *poa_name, const char *orb_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Shut down. Invoke the destroy() methods on the orb and poa. * * @return -1 on failure, 0 on success */ - int fini (TAO_ENV_SINGLE_ARG_DECL); + int fini (ACE_ENV_SINGLE_ARG_DECL); /// Destructor. ~TAO_ORB_Manager (void); @@ -119,7 +119,7 @@ public: * * @return -1 on failure, 0 on success */ - int activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * Activate <servant>, using the POA <activate_object> call. Users @@ -130,7 +130,7 @@ public: * memory deallocation of the string. */ char *activate (PortableServer::Servant servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Deactivate object in RootPOA. * @@ -138,7 +138,7 @@ public: * of the servant to deactivate in the POA */ void deactivate (const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Precondition: init_child_poa has been called. Activate <servant> @@ -156,7 +156,7 @@ public: */ char *activate_under_child_poa (const char *object_name, PortableServer::Servant servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Deactivate object in child POA. * @@ -164,7 +164,7 @@ public: * the object to deactivate in the POA */ void deactivate_under_child_poa (const char *id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** Run the ORB event loop with the specified <tv> time value. * @@ -172,8 +172,8 @@ public: * @return -1 on failure, 0 on success */ int run (ACE_Time_Value &tv - TAO_ENV_ARG_DECL_WITH_DEFAULTS); - int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); + int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * Accessor which returns the ORB pointer. Following the normal diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp index baa47b7ea5d..02732b62984 100644 --- a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp +++ b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp @@ -26,7 +26,7 @@ TAO_ObjectReferenceFactory::TAO_ObjectReferenceFactory (TAO_POA *poa) CORBA::Object * TAO_ObjectReferenceFactory::make_object (const char *intf, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::OctetSeq object_id = id; @@ -39,7 +39,7 @@ TAO_ObjectReferenceFactory::make_object (const char *intf, CORBA::Object_var object = this->poa_->invoke_key_to_object (intf, *user_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object._retn (); diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.h b/TAO/tao/PortableServer/ObjectReferenceFactory.h index a47b3ef1a3a..4f6a75e3e9e 100644 --- a/TAO/tao/PortableServer/ObjectReferenceFactory.h +++ b/TAO/tao/PortableServer/ObjectReferenceFactory.h @@ -57,7 +57,7 @@ class TAO_PortableServer_Export TAO_ObjectReferenceFactory virtual CORBA::Object_ptr make_object ( const char * repository_id, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); void set_servant (PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp index f79f70d3e9a..25c44c8cdf7 100644 --- a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp @@ -26,7 +26,7 @@ TAO_ObjectReferenceTemplate::~TAO_ObjectReferenceTemplate (void) } char * -TAO_ObjectReferenceTemplate::server_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Priyanka, you're not conforming to the C++ mapping. Do a @@ -36,7 +36,7 @@ TAO_ObjectReferenceTemplate::server_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_ObjectReferenceTemplate::orb_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Priyanka, you're not conforming to the C++ mapping. Do a @@ -46,7 +46,7 @@ TAO_ObjectReferenceTemplate::orb_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableInterceptor::AdapterName * -TAO_ObjectReferenceTemplate::adapter_name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Priyanka, you're not conforming to the C++ mapping. You must @@ -62,7 +62,7 @@ CORBA::Object * TAO_ObjectReferenceTemplate::make_object ( const char * intf, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) // @@ Priyanka, is this method supposed to have an exception // specification? { @@ -78,21 +78,21 @@ TAO_ObjectReferenceTemplate::make_object ( CORBA::Object_var object = this->poa_->invoke_key_to_object (intf, *user_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // @@ Priyanka, what purpose does this object_to_string() call // serve? Can't you remove it? CORBA::String_var ior = this->poa_->orb_core ().orb ()->object_to_string (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object._retn (); } void -TAO_ObjectReferenceTemplate::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ObjectReferenceTemplate::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // @@ Priyanka, this is a reference counted object. You cannot // directly call delete() on the instance. Use the reference diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h index 6941b59ab18..904dbc8f659 100644 --- a/TAO/tao/PortableServer/ObjectReferenceTemplate.h +++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h @@ -62,22 +62,22 @@ class TAO_PortableServer_Export TAO_ObjectReferenceTemplate /// Destructor ~TAO_ObjectReferenceTemplate (void); - virtual char * server_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * orb_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableInterceptor::AdapterName * adapter_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Object_ptr make_object ( const char * repository_id, const PortableInterceptor::ObjectId & id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); private: diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 221f0f9fa6d..afeb5baca31 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -207,7 +207,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ void TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the default policies. @@ -215,42 +215,42 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies // Thread policy. TAO_Thread_Policy thread_policy (PortableServer::ORB_CTRL_MODEL); - policies.merge_policy (&thread_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&thread_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; #endif /* TAO_HAS_MINIMUM_POA == 0 */ // Lifespan policy. TAO_Lifespan_Policy lifespan_policy (PortableServer::TRANSIENT); - policies.merge_policy (&lifespan_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&lifespan_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // ID uniqueness policy. TAO_Id_Uniqueness_Policy id_uniqueness_policy (PortableServer::UNIQUE_ID); - policies.merge_policy (&id_uniqueness_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&id_uniqueness_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // ID assignment policy. TAO_Id_Assignment_Policy id_assignment_policy (PortableServer::SYSTEM_ID); - policies.merge_policy (&id_assignment_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&id_assignment_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if (TAO_HAS_MINIMUM_POA == 0) // Implicit activation policy. TAO_Implicit_Activation_Policy implicit_activation_policy (PortableServer::NO_IMPLICIT_ACTIVATION); - policies.merge_policy (&implicit_activation_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Servant retention policy. TAO_Servant_Retention_Policy servant_retention_policy (PortableServer::RETAIN); - policies.merge_policy (&servant_retention_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&servant_retention_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Request processing policy. TAO_Request_Processing_Policy request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY); - policies.merge_policy (&request_processing_policy TAO_ENV_ARG_PARAMETER); + policies.merge_policy (&request_processing_policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; #endif /* TAO_HAS_MINIMUM_POA == 0 */ } @@ -295,7 +295,7 @@ int TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key, TAO_ServerRequest &req, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START); @@ -310,7 +310,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key, servant_upcall.prepare_for_upcall (key, operation, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result); if (result != TAO_Adapter::DS_OK) @@ -322,7 +322,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key, this->servant_dispatcher_->dispatch (servant_upcall, req - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result); } @@ -333,7 +333,7 @@ void TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key, PortableServer::ObjectId &system_id, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Object_Adapter::poa_name poa_system_name; CORBA::Boolean is_root = 0; @@ -366,7 +366,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key, is_root, poa_creation_time, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -377,7 +377,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key, int TAO_Object_Adapter::activate_poa (const poa_name &folded_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int result = -1; @@ -414,7 +414,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, { current = parent->find_POA_i (*iterator, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::AdapterNonExistent, ex) @@ -432,7 +432,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, #else ACE_UNUSED_ARG (folded_name); ACE_UNUSED_ARG (poa); - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_MINIMUM_POA == 0 */ return result; @@ -443,7 +443,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name, CORBA::Boolean root, const TAO_Temporary_Creation_Time &poa_creation_time, TAO_POA *&poa - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int result = 0; @@ -492,7 +492,7 @@ TAO_Object_Adapter::unbind_poa (TAO_POA *poa, int TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId id; TAO_POA *poa = 0; @@ -500,14 +500,14 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key this->locate_poa (key, id, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::Servant servant = 0; TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id, servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); switch (servant_location) @@ -528,7 +528,7 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key TAO_SERVANT_LOCATION TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key, PortableServer::Servant &servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId id; TAO_POA *poa = 0; @@ -536,23 +536,23 @@ TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key, this->locate_poa (key, id, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id, servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND); return servant_location; } void -TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) +TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) { // Add in the default POA policies to the default list. this->init_default_policies (this->default_poa_policies () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // If a POA extension hasn't changed the servant dispatcher, initialize the @@ -572,7 +572,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) PortableServer::POAManager_var safe_poa_manager = poa_manager; // Set the default Server Protocol Policy. - this->set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_POA_Policy_Set policies (this->default_poa_policies ()); @@ -587,12 +587,12 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); policies.merge_policy (&implicit_activation_policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif /* TAO_HAS_MINIMUM_POA == 0 */ // Merge policies from the ORB level. this->validator ().merge_policies (policies.policies () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Construct a new POA @@ -606,7 +606,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) this->thread_lock (), this->orb_core_, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // The Object_Adapter will keep a reference to the Root POA so that @@ -621,7 +621,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Object_Adapter::set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Object_Adapter::set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL) { TAO_Thread_Lane_Resources &default_lane_resources = this->orb_core_.thread_lane_resources_manager ().default_lane_resources (); @@ -630,19 +630,19 @@ TAO_Object_Adapter::set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL) default_lane_resources.acceptor_registry (); TAO_Protocols_Hooks *protocols_hooks = - this->orb_core_.get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core_.get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; protocols_hooks->set_default_server_protocol_policy (acceptor_registry - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Object_Adapter::close (int wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->check_close (wait_for_completion TAO_ENV_ARG_PARAMETER); + this->check_close (wait_for_completion ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shutting down the ORB causes all object adapters to be destroyed, @@ -665,18 +665,18 @@ TAO_Object_Adapter::close (int wait_for_completion CORBA::Boolean etherealize_objects = 1; root->destroy (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::release (root); } void TAO_Object_Adapter::check_close (int wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_POA::check_for_valid_wait_for_completions (this->orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -690,7 +690,7 @@ int TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::memcmp (key.get_buffer (), @@ -714,7 +714,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, // The receive_request_service_contexts() interception point // must be invoked before the operation is dispatched to the // servant. - sri_adapter.receive_request_service_contexts (&ri TAO_ENV_ARG_PARAMETER); + sri_adapter.receive_request_service_contexts (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If a PortableInterceptor::ForwardRequest exception was @@ -722,7 +722,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, // with the appropriate return status. if (sri_adapter.location_forwarded ()) { - forward_to = ri.forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER); + forward_to = ri.forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return TAO_Adapter::DS_FORWARD; @@ -732,7 +732,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, result = this->dispatch_servant (key, request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #if TAO_HAS_INTERCEPTORS == 1 ACE_TRY_CHECK; @@ -741,7 +741,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, { ri.forward_reference (forward_to.ptr ()); sri_adapter.send_other (&ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -750,11 +750,11 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key, ri.exception (&ACE_ANY_EXCEPTION); sri_adapter.send_exception (&ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus status = - ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Only re-throw the exception if it hasn't been transformed by @@ -799,7 +799,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub, TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0) continue; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_ServantBase *servant = 0; @@ -807,7 +807,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub, TAO_SERVANT_LOCATION servant_location = this->find_servant (objkey.in (), servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (servant_location != TAO_SERVANT_NOT_FOUND) @@ -895,7 +895,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void) int TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { poa_name folded_name; int result = this->persistent_poa_system_map_.recover_key (system_name, @@ -914,7 +914,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &s { result = this->object_adapter_->activate_poa (folded_name, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } } @@ -969,7 +969,7 @@ TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void) int TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int result = this->object_adapter_->persistent_poa_name_map_->find (system_name, poa); @@ -978,7 +978,7 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &syste result = this->object_adapter_->activate_poa (system_name, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -1127,7 +1127,7 @@ TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void) { ACE_TRY_NEW_ENV { - this->poa_.complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_.complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1169,7 +1169,7 @@ int TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key, const char *operation, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Acquire the object adapter lock first. int result = this->object_adapter_->lock ().acquire (); @@ -1185,18 +1185,18 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of // course, the thread making the non-servant upcall is this thread. - this->object_adapter_->wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER); + this->object_adapter_->wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); // Locate the POA. this->object_adapter_->locate_poa (key, this->system_id_, this->poa_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); // Check the state of the POA Manager. - this->poa_->check_poa_manager_state (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); // Setup current for this request. @@ -1219,7 +1219,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key this->system_id_, *this, this->current_context_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } #if (TAO_HAS_MINIMUM_CORBA == 0) @@ -1254,7 +1254,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key this->state_ = OBJECT_ADAPTER_LOCK_RELEASED; // Serialize servants (if appropriate). - this->single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_PARAMETER); + this->single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED); // We have acquired the servant lock. Record this for later use. @@ -1266,7 +1266,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key TAO_POA * TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Acquire the object adapter lock first. int result = this->object_adapter_->lock ().acquire (); @@ -1282,14 +1282,14 @@ TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of // course, the thread making the non-servant upcall is this thread. - this->object_adapter_->wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER); + this->object_adapter_->wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Locate the POA. this->object_adapter_->locate_poa (key, this->system_id_, this->poa_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->poa_; @@ -1401,7 +1401,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void) if (this->using_servant_locator_) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->poa_->servant_locator_->postinvoke (this->current_context_.object_id (), @@ -1409,7 +1409,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void) this->operation_, this->cookie_, this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1423,7 +1423,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void) } void -TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_DECL) +TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL) { #if (TAO_HAS_MINIMUM_POA == 0) // Serialize servants (if necessary). @@ -1443,7 +1443,7 @@ TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (TAO_ENV_SINGLE_AR ACE_THROW (CORBA::OBJ_ADAPTER ()); } #else - TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check + ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* !TAO_HAS_MINIMUM_POA == 0 */ } @@ -1468,11 +1468,11 @@ TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void) if (new_count == 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->poa_->cleanup_servant (this->active_object_map_entry_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1521,7 +1521,7 @@ TAO_Object_Adapter::Servant_Upcall::poa_cleanup (void) { ACE_TRY_NEW_ENV { - this->poa_->complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1587,7 +1587,7 @@ TAO_POA_Current_Impl::teardown (void) } PortableServer::POA_ptr -TAO_POA_Current_Impl::get_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA_Current_Impl::get_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -1595,7 +1595,7 @@ TAO_POA_Current_Impl::get_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableServer::ObjectId * -TAO_POA_Current_Impl::get_object_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA_Current_Impl::get_object_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -1616,7 +1616,7 @@ TAO_POA_Current_Impl::orb_core (void) const } PortableServer::POA_ptr -TAO_POA_Current::get_POA (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Current::get_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -1625,11 +1625,11 @@ TAO_POA_Current::get_POA (TAO_ENV_SINGLE_ARG_DECL) if (impl == 0) ACE_THROW_RETURN (PortableServer::Current::NoContext (), 0); - return impl->get_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::ObjectId * -TAO_POA_Current::get_object_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Current::get_object_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)) { @@ -1638,7 +1638,7 @@ TAO_POA_Current::get_object_id (TAO_ENV_SINGLE_ARG_DECL) if (impl == 0) ACE_THROW_RETURN (PortableServer::Current::NoContext (), 0); - return impl->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); } TAO_POA_Current_Impl * diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 5b7994f8d89..b75ba21b3c3 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -73,14 +73,14 @@ public: TAO_POA_Current (void); // Constructor - PortableServer::POA_ptr get_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); // Returns the POA on which the current request is being invoked. // Can raise the <CORBA::NoContext> exception if this function is // not invoked in the context of an upcall. - PortableServer::ObjectId *get_object_id (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); // Returns the object id of the current request being invoked. Can @@ -119,13 +119,13 @@ public: friend class TAO_POA; - PortableServer::POA_ptr get_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); // Return pointer to the invoking POA. Raises the // <CORBA::NoContext> exception. - PortableServer::ObjectId *get_object_id (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::Current::NoContext)); // Return pointer to the object id through which this was invoked. @@ -234,21 +234,21 @@ public: int dispatch_servant (const TAO_ObjectKey &key, TAO_ServerRequest &req, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int locate_servant (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_SERVANT_LOCATION find_servant (const TAO_ObjectKey &key, PortableServer::Servant &servant - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int find_poa (const poa_name &system_name, CORBA::Boolean activate_it, CORBA::Boolean root, const TAO_Temporary_Creation_Time &poa_creation_time, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int bind_poa (const poa_name &folded_name, TAO_POA *poa, @@ -260,7 +260,7 @@ public: int activate_poa (const poa_name &folded_name, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ACE_Lock &lock (void); @@ -295,20 +295,20 @@ public: /// Initialize the default set of POA policies. void init_default_policies (TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation - virtual void open (TAO_ENV_SINGLE_ARG_DECL); + virtual void open (ACE_ENV_SINGLE_ARG_DECL); virtual void close (int wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void check_close (int wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int priority (void) const; virtual int dispatch (TAO_ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out foward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual const char *name (void) const; virtual CORBA::Object_ptr root (void); @@ -318,31 +318,31 @@ public: protected: int locate_servant_i (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_SERVANT_LOCATION find_servant_i (const TAO_ObjectKey &key, PortableServer::Servant &servant - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void dispatch_servant_i (const TAO_ObjectKey &key, TAO_ServerRequest &req, void *context - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void locate_poa (const TAO_ObjectKey &key, PortableServer::ObjectId &id, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int find_transient_poa (const poa_name &system_name, CORBA::Boolean root, const TAO_Temporary_Creation_Time &poa_creation_time, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int bind_transient_poa (TAO_POA *poa, poa_name_out system_name); @@ -356,7 +356,7 @@ protected: int unbind_persistent_poa (const poa_name &folded_name, const poa_name &system_name); - void set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL); + void set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL); static ACE_Lock *create_lock (int enable_locking, TAO_SYNCH_MUTEX &thread_lock); @@ -377,7 +377,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual int bind_persistent_poa (const poa_name &folded_name, TAO_POA *poa, @@ -410,7 +410,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int bind_persistent_poa (const poa_name &folded_name, TAO_POA *poa, @@ -444,7 +444,7 @@ public: virtual int find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int bind_persistent_poa (const poa_name &folded_name, TAO_POA *poa, @@ -634,11 +634,11 @@ public: int prepare_for_upcall (const TAO_ObjectKey &key, const char *operation, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Locate POA and servant. TAO_POA *lookup_POA (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Locate POA. TAO_POA &poa (void) const; @@ -689,7 +689,7 @@ public: protected: void servant_locator_cleanup (void); - void single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_DECL); + void single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL); void single_threaded_poa_cleanup (void); void servant_cleanup (void); void poa_cleanup (void); diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i index 1bbfebe3018..f472c0c0247 100644 --- a/TAO/tao/PortableServer/Object_Adapter.i +++ b/TAO/tao/PortableServer/Object_Adapter.i @@ -45,36 +45,36 @@ TAO_Object_Adapter::transient_poa_name_size () ACE_INLINE int TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (-1); return this->locate_servant_i (key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE TAO_SERVANT_LOCATION TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key, PortableServer::Servant &servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Lock access for the duration of this transaction. TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND); return this->find_servant_i (key, servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE int TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return this->hint_strategy_->find_persistent_poa (system_name, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE int @@ -83,13 +83,13 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name, CORBA::Boolean root, const TAO_Temporary_Creation_Time &poa_creation_time, TAO_POA *&poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (activate_it) { return this->find_persistent_poa (system_name, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { @@ -97,7 +97,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name, root, poa_creation_time, poa - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index 787e3f0efcc..b1a4e99f340 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -377,7 +377,7 @@ template class TAO_Singleton<TAO_Operation_Table_Parameters, TAO_SYNCH_RECURSIVE // This is necessary with g++ 2.91.66 to avoid a couple of strange // unresolved ACE_Hash_Map_Entry symbols. (Strange because c++filt // can't demangle them.) -template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, void *, void * TAO_ENV_ARG_DECL_NOT_USED)>; +template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, void *, void * ACE_ENV_ARG_DECL_NOT_USED)>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index c8a6084c081..57cbe5236e5 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -61,7 +61,7 @@ TAO_POA::_tao_poa_downcast(void) PortableServer::ThreadPolicy_ptr TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Thread_Policy *thread_policy = 0; @@ -77,7 +77,7 @@ TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value PortableServer::LifespanPolicy_ptr TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Lifespan_Policy *lifespan_policy = 0; @@ -91,7 +91,7 @@ TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value PortableServer::IdUniquenessPolicy_ptr TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Uniqueness_Policy *id_uniqueness_policy = 0; @@ -105,7 +105,7 @@ TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va PortableServer::IdAssignmentPolicy_ptr TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Assignment_Policy *id_assignment_policy = 0; @@ -121,7 +121,7 @@ TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va PortableServer::ImplicitActivationPolicy_ptr TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Implicit_Activation_Policy *implicit_activation_policy = 0; @@ -135,7 +135,7 @@ TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo PortableServer::ServantRetentionPolicy_ptr TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Servant_Retention_Policy *servant_retention_policy = 0; @@ -149,7 +149,7 @@ TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy PortableServer::RequestProcessingPolicy_ptr TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Request_Processing_Policy *request_processing_policy = 0; @@ -166,7 +166,7 @@ TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPoli void TAO_POA::set_obj_ref_factory ( PortableInterceptor::ObjectReferenceFactory *current_factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ Priyanka, I have no idea what you're doing here. @@ -209,7 +209,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : name_ (name), poa_manager_ (poa_manager), policy_list_ (0), @@ -260,7 +260,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, // Parse the policies that are used in the critical path in // a cache. this->cached_policies_.update (this->policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if (TAO_HAS_MINIMUM_POA == 1) @@ -290,7 +290,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID, this->persistent (), this->orb_core_.server_factory ()->active_object_map_creation_parameters () - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); // Give ownership of the new map to the auto pointer. Note, that it @@ -349,7 +349,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, { int temp = this->use_imr_; this->use_imr_ = 0; - this->imr_notify_startup (TAO_ENV_SINGLE_ARG_PARAMETER); + this->imr_notify_startup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->use_imr_ = temp; } @@ -382,7 +382,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, TAO_ObjectReferenceTemplate ( server_id.in (), orb_id.in (), - this->adapter_name (TAO_ENV_SINGLE_ARG_PARAMETER), + this->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER), this), CORBA::NO_MEMORY ()); // @@ Priyanka, where's the ACE_CHECK? @@ -390,13 +390,13 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, this->ort_template_ = ort_template; this->set_obj_ref_factory (this->ort_template_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // @@ Priyanka, where's the ACE_CHECK? // Iterate over the registered IOR interceptors so that they may be // given the opportunity to add tagged components to the profiles // for this servant. - this->tao_establish_components (TAO_ENV_SINGLE_ARG_PARAMETER); + this->tao_establish_components (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -407,7 +407,7 @@ TAO_POA::~TAO_POA (void) } void -TAO_POA::complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL) { // No longer awaiting destruction. this->waiting_destruction_ = 0; @@ -469,7 +469,7 @@ PortableServer::POA_ptr TAO_POA::create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -480,12 +480,12 @@ TAO_POA::create_POA_i (const char *adapter_name, // Merge policies from the ORB level. this->object_adapter ().validator ().merge_policies (tao_policies.policies () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Merge in any policies that the user may have specified. tao_policies.merge_policies (policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // If any of the policy objects specified are not valid for the ORB @@ -496,7 +496,7 @@ TAO_POA::create_POA_i (const char *adapter_name, // policies parameter value of the first offending policy object. tao_policies.validate_policies (this->object_adapter ().validator (), this->orb_core_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // If the poa_manager parameter is null, a new POAManager object is @@ -521,7 +521,7 @@ TAO_POA::create_POA_i (const char *adapter_name, TAO_POA *poa = this->create_POA_i (adapter_name, *tao_poa_manager, tao_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); return PortableServer::POA::_duplicate (poa); @@ -536,7 +536,7 @@ TAO_POA::new_POA (const String &name, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_POA *poa; @@ -549,7 +549,7 @@ TAO_POA::new_POA (const String &name, thread_lock, orb_core, object_adapter - TAO_ENV_ARG_PARAMETER), + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -560,7 +560,7 @@ TAO_POA * TAO_POA::create_POA_i (const TAO_POA::String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -596,7 +596,7 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name, this->object_adapter ().thread_lock (), this->orb_core_, this->object_adapter_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Give ownership of the new map to the POA_var. Note, that it // is important for the POA_var to take ownership before @@ -638,7 +638,7 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name, PortableServer::POA_ptr TAO_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { @@ -657,7 +657,7 @@ TAO_POA::find_POA (const char *adapter_name, TAO_POA *poa = this->find_POA_i (adapter_name, activate_it - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); return PortableServer::POA::_duplicate (poa); @@ -666,7 +666,7 @@ TAO_POA::find_POA (const char *adapter_name, TAO_POA * TAO_POA::find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)) { @@ -683,13 +683,13 @@ TAO_POA::find_POA_i (const ACE_CString &child_name, if (!CORBA::is_nil (this->adapter_activator_.in ())) { // Check the state of the POA Manager. - this->check_poa_manager_state (TAO_ENV_SINGLE_ARG_PARAMETER); + this->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean success = this->adapter_activator_->unknown_adapter (this, child_name.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (success) @@ -731,7 +731,7 @@ TAO_POA::find_POA_i (const ACE_CString &child_name, void TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->cleanup_in_progress_) @@ -740,7 +740,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (this->orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->cleanup_in_progress_ = 1; @@ -796,7 +796,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, child_poa->destroy_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -814,15 +814,15 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, TAO_POA *tao_poa = 0; PortableServer::POA_var poa = - this->server_object_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->server_object_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; tao_poa = poa->_tao_poa_downcast(); PortableServer::ObjectId_var id = - tao_poa->servant_to_id_i (this->server_object_ TAO_ENV_ARG_PARAMETER); + tao_poa->servant_to_id_i (this->server_object_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - tao_poa->deactivate_object_i (id.in ()TAO_ENV_ARG_PARAMETER); + tao_poa->deactivate_object_i (id.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -842,7 +842,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, this->deactivate_all_objects_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // If there are no outstanding requests and that we are not in a @@ -854,7 +854,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, (non_servant_upcall_in_progress == 0 || &non_servant_upcall_in_progress->poa () != this)) { - this->complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->adapter_state_ = PortableInterceptor::NON_EXISTENT; @@ -888,7 +888,7 @@ TAO_POA::delete_child (const TAO_POA::String &child) } PortableServer::POAList * -TAO_POA::the_children_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POAList_var children; @@ -918,7 +918,7 @@ TAO_POA::the_children_i (TAO_ENV_SINGLE_ARG_DECL) // TypeCodes! // CORBA::StringSeq * -TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { /// The adapter name is the sequence of names starting from the @@ -939,7 +939,7 @@ TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL) CORBA::StringSeq_var safe_args (name_seq); CORBA::String_var current_poa_name = - this->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong name_seq_length = 0; @@ -963,11 +963,11 @@ TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL) /// Make the parent name as the current_poa_name /// Go up the ladder by one parent ;-) PortableServer::POA_var current_poa_name_parent = - current_poa->the_parent (TAO_ENV_SINGLE_ARG_PARAMETER); + current_poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); current_poa_name = - current_poa_name_parent->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + current_poa_name_parent->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); current_poa = @@ -991,7 +991,7 @@ TAO_POA::set_mprofile (TAO_MProfile *mprofile) void TAO_POA::tao_add_ior_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles. @@ -1002,7 +1002,7 @@ TAO_POA::tao_add_ior_component (const IOP::TaggedComponent &component { TAO_Profile *profile = this->mprofile_->get_profile (i); - profile->add_tagged_component (component TAO_ENV_ARG_PARAMETER); + profile->add_tagged_component (component ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1012,7 +1012,7 @@ void TAO_POA::tao_add_ior_component_to_profile ( const IOP::TaggedComponent &component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Add the given tagged component to all profiles matching the given @@ -1027,7 +1027,7 @@ TAO_POA::tao_add_ior_component_to_profile ( if (profile->tag () == profile_id) { - profile->add_tagged_component (component TAO_ENV_ARG_PARAMETER); + profile->add_tagged_component (component ACE_ENV_ARG_PARAMETER); ACE_CHECK; found_profile = 1; @@ -1066,7 +1066,7 @@ adapter_state_changed (const PortableInterceptor::ObjectReferenceTemplateSeq *se #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ServantManager_ptr -TAO_POA::get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1089,7 +1089,7 @@ TAO_POA::get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1105,7 +1105,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr if (this->cached_policies_.servant_retention () == PortableServer::RETAIN) { this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->servant_activator_.in ())) @@ -1116,7 +1116,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr else { this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->servant_locator_.in ())) @@ -1127,7 +1127,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr } PortableServer::Servant -TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::get_servant_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)) @@ -1163,7 +1163,7 @@ TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL) // conforming caller need not invoke _remove_ref on the returned // Servant if the type of the Servant uses the default reference // counting inherited from ServantBase. - result->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + result->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result; @@ -1179,7 +1179,7 @@ TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_POA::set_servant_i (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1212,7 +1212,7 @@ TAO_POA::set_servant_i (PortableServer::Servant servant TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this); ACE_UNUSED_ARG (non_servant_upcall); - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -1300,7 +1300,7 @@ TAO_POA::is_user_id_in_map (const PortableServer::ObjectId &id, PortableServer::ObjectId * TAO_POA::activate_object_i (PortableServer::Servant servant, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) @@ -1354,7 +1354,7 @@ TAO_POA::activate_object_i (PortableServer::Servant servant, // least once on the Servant argument before returning. When the POA // no longer needs the Servant, it will invoke _remove_ref on it the // same number of times. - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return user_id._retn (); @@ -1364,7 +1364,7 @@ void TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -1452,29 +1452,29 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, // _add_ref at least once on the Servant argument before // returning. When the POA no longer needs the Servant, it will // invoke _remove_ref on it the same number of times. - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { this->deactivate_all_objects_i (etherealize_objects - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->wait_for_completions (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { while (this->object_adapter ().enable_locking_ && wait_for_completion && @@ -1494,7 +1494,7 @@ TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion void TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (wait_for_completion) { @@ -1530,7 +1530,7 @@ TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core, void TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1580,14 +1580,14 @@ TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects ++i) { this->deactivate_map_entry (map_entries[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -1611,13 +1611,13 @@ TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id } this->deactivate_map_entry (active_object_map_entry - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Decrement the reference count. CORBA::UShort new_count = --active_object_map_entry->reference_count_; @@ -1625,7 +1625,7 @@ TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_m if (new_count == 0) { this->cleanup_servant (active_object_map_entry - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -1647,7 +1647,7 @@ TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_m void TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If a servant manager is associated with the POA, // ServantLocator::etherealize will be invoked with the oid and the @@ -1702,7 +1702,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en active_object_map_entry->servant_, this->cleanup_in_progress_, remaining_activations - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -1721,7 +1721,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this); ACE_UNUSED_ARG (non_servant_upcall); - active_object_map_entry->servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + active_object_map_entry->servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -1738,7 +1738,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en } void -TAO_POA::check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POAManager::State state = this->poa_manager_.get_state_i (); @@ -1812,7 +1812,7 @@ TAO_POA::check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_ptr TAO_POA::create_reference_i (const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1868,7 +1868,7 @@ TAO_POA::create_reference_i (const char *intf CORBA::Object_var object = this->obj_ref_factory_->make_object (intf, *obj_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object._retn (); @@ -1877,7 +1877,7 @@ TAO_POA::create_reference_i (const char *intf CORBA::Object_ptr TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -1906,7 +1906,7 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, CORBA::Object_var obj_ptr = this->obj_ref_factory_->make_object (intf, *obj_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return obj_ptr._retn (); @@ -1914,7 +1914,7 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, PortableServer::ObjectId * TAO_POA::servant_to_id_i (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -1981,7 +1981,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant // is invoked at least once on the Servant argument before // returning. Otherwise, the POA does not increment or decrement // the reference count of the Servant passed to this function. - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return user_id._retn (); @@ -2012,7 +2012,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant if (poa_current_impl != 0 && servant == poa_current_impl->servant ()) { - return poa_current_impl->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + return poa_current_impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); } } } @@ -2027,7 +2027,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant PortableServer::ObjectId * TAO_POA::servant_to_system_id_i (PortableServer::Servant servant, CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -2094,7 +2094,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant, // is invoked at least once on the Servant argument before // returning. Otherwise, the POA does not increment or decrement // the reference count of the Servant passed to this function. - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return system_id._retn (); @@ -2107,7 +2107,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant, CORBA::Object_ptr TAO_POA::servant_to_reference (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -2123,7 +2123,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant PortableServer::ObjectId_var id = this->servant_to_system_id (servant, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ObjectId user_id; @@ -2145,7 +2145,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant CORBA::Object_var object = this->obj_ref_factory_->make_object (servant->_interface_repository_id (), *obj_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return object._retn (); @@ -2153,7 +2153,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant PortableServer::Servant TAO_POA::reference_to_servant (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, @@ -2181,7 +2181,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference // servant associated with that object in the Active Object Map. if (this->cached_policies_.servant_retention () == PortableServer::RETAIN) { - TAO_ObjectKey_var key = reference->_key (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // If the object reference was not created by this POA, the @@ -2256,7 +2256,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference // _remove_ref on the returned Servant if the type of the // Servant uses the default reference counting inherited // from ServantBase. - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return servant; @@ -2301,7 +2301,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference // _remove_ref on the returned Servant if the type of the // Servant uses the default reference counting inherited // from ServantBase. - result->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + result->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result; @@ -2322,7 +2322,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference PortableServer::ObjectId * TAO_POA::reference_to_id (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)) @@ -2343,7 +2343,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference // POA on which the operation is being performed. If the object // reference was not created by this POA, the WrongAdapter exception // is raised. - TAO_ObjectKey_var key = reference->_key (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); PortableServer::ObjectId system_id; @@ -2402,7 +2402,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference PortableServer::Servant TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -2440,7 +2440,7 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id // conforming caller need not invoke _remove_ref on the returned // Servant if the type of the Servant uses the default reference // counting inherited from ServantBase. - servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return servant; @@ -2455,7 +2455,7 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id CORBA::Object_ptr TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -2488,7 +2488,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id servant, 1, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else // If the Object Id value is not active in the POA, an @@ -2500,7 +2500,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id } CORBA::OctetSeq * -TAO_POA::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return new CORBA::OctetSeq (this->id_); @@ -2509,7 +2509,7 @@ TAO_POA::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) TAO_SERVANT_LOCATION TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id, PortableServer::Servant &servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If the POA has the RETAIN policy, the POA looks in the Active // Object Map to find if there is a servant associated with the @@ -2597,7 +2597,7 @@ TAO_POA::locate_servant_i (const char *operation, const PortableServer::ObjectId &system_id, TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_POA_Current_Impl &poa_current_impl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If we have the RETAIN policy, convert/transform from system id to // user id. @@ -2732,7 +2732,7 @@ TAO_POA::locate_servant_i (const char *operation, // Invocations of incarnate and etherealize on the servant manager are mutually exclusive. servant = this->servant_activator_->incarnate (poa_current_impl.object_id (), this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (servant == 0) @@ -2806,7 +2806,7 @@ TAO_POA::locate_servant_i (const char *operation, this, operation, cookie - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (servant == 0) @@ -3312,7 +3312,7 @@ TAO_Adapter_Activator::TAO_Adapter_Activator (PortableServer::POAManager_ptr poa CORBA::Boolean TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Default policies @@ -3322,19 +3322,19 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, PortableServer::POA_var child = parent->create_POA (name, this->poa_manager_.in (), default_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TRY { - child->the_activator (this TAO_ENV_ARG_PARAMETER); + child->the_activator (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { child->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return 0; } @@ -3350,7 +3350,7 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, CORBA::Object_ptr TAO_POA::invoke_key_to_object (const char *intf, PortableServer::ObjectId &user_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Short priority; @@ -3443,7 +3443,7 @@ TAO_POA::invoke_key_to_object (const char *intf, servant, 1, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { @@ -3453,7 +3453,7 @@ TAO_POA::invoke_key_to_object (const char *intf, 0, 1, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } @@ -3466,12 +3466,12 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key, TAO_ServantBase *servant, CORBA::Boolean collocated, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Check if the ORB is still running, otherwise throw an exception. // @@ What if the ORB was destroyed? In that case we shouldn't even // get here! - this->orb_core_.check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ -3499,7 +3499,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key, } CORBA::String_var imr_str = - imr->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER); + imr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (obj); if (TAO_debug_level > 0) @@ -3541,7 +3541,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key, ior.c_str ())); obj = - this->orb_core_.orb ()->string_to_object (ior.c_str () TAO_ENV_ARG_PARAMETER); + this->orb_core_.orb ()->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (obj); return obj; @@ -3552,7 +3552,7 @@ orbkey: #endif /* TAO_HAS_MINIMUM_CORBA */ TAO_Stub *data = - this->key_to_stub_i (key, type_id, priority TAO_ENV_ARG_PARAMETER); + this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -3590,30 +3590,30 @@ TAO_Stub * TAO_POA::key_to_stub (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Check if the ORB is still running, otherwise throw an exception. // @@ What if the ORB was destroyed? In that case we shouldn't even // get here! - this->orb_core_.check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return this->key_to_stub_i (key, type_id, priority TAO_ENV_ARG_PARAMETER); + return this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER); } TAO_Stub * TAO_POA::key_to_stub_i (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::PolicyList_var client_exposed_policies = this->client_exposed_policies (priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); /// Set the endpoints - (void) this->orb_core_.open (TAO_ENV_SINGLE_ARG_PARAMETER); + (void) this->orb_core_.open (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Default_Acceptor_Filter filter; @@ -3623,14 +3623,14 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key, client_exposed_policies._retn (), &filter, this->orb_core_.lane_resources ().acceptor_registry () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return data; } void -TAO_POA::tao_establish_components (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::tao_establish_components (ACE_ENV_SINGLE_ARG_DECL) { PortableInterceptor::IORInfo_ptr info_temp; ACE_NEW_THROW_EX (info_temp, @@ -3645,13 +3645,13 @@ TAO_POA::tao_establish_components (TAO_ENV_SINGLE_ARG_DECL) PortableInterceptor::IORInfo_var info = info_temp; this->establish_components (info.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_POA::establish_components (PortableInterceptor::IORInfo *info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Iterate over the registered IOR interceptors so that they may be // given the opportunity to add tagged components to the profiles @@ -3669,7 +3669,7 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info { interceptors[i]->establish_components ( info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3682,7 +3682,7 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info if (TAO_debug_level > 1) { CORBA::String_var name = interceptors[i]->name ( - TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_SINGLE_ARG_PARAMETER); // @@ What do we do if we get an exception here? if (name.in () != 0) @@ -3703,14 +3703,14 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info } this->components_established_i (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return; } void TAO_POA::components_established_i (PortableInterceptor::IORInfo *info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Iterate over the registered IOR interceptors so that they may be // given the opportunity to add tagged components to the profiles @@ -3730,7 +3730,7 @@ TAO_POA::components_established_i (PortableInterceptor::IORInfo *info { interceptors[j]->components_established ( info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3757,7 +3757,7 @@ TAO_POA::get_policy_list () void TAO_POA::save_ior_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // @@ Priyanka, let's think about why this is broken. // - This method gets invoked by IORInfo::add_ior_component(). @@ -3780,7 +3780,7 @@ void TAO_POA:: save_ior_component_and_profile_id (const IOP::TaggedComponent &component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // @@ Priyanka, let's think about why this is broken. // - This method gets invoked by IORInfo::add_ior_component(). @@ -3810,7 +3810,7 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key, CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_Acceptor_Registry &acceptor_registry - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int error = 0; @@ -3882,7 +3882,7 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key, { // Get the ith profile profile = mprofile.get_profile (i); - profile->policies (policy_list TAO_ENV_ARG_PARAMETER); + profile->policies (policy_list ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -3898,14 +3898,14 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key, if (this->profile_id_ == 0) { this->tao_add_ior_component (this->tagged_component_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else { this->tao_add_ior_component_to_profile (this->tagged_component_, this->profile_id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -3914,12 +3914,12 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key, this->orb_core_.create_stub_object (mprofile, type_id, policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::PolicyList * TAO_POA::client_exposed_policies (CORBA::Short object_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::PolicyList *client_exposed_policies = 0; ACE_NEW_THROW_EX (client_exposed_policies, @@ -3932,7 +3932,7 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority // Add in all of the client exposed policies. this->policies_.add_client_exposed_fixed_policies (client_exposed_policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_UNUSED_ARG (object_priority); @@ -3946,7 +3946,7 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority #if (TAO_HAS_MINIMUM_CORBA == 0) void -TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notifying IMR of startup\n")); @@ -3970,16 +3970,16 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var id = root_poa->activate_object_i (this->server_object_, this->cached_policies_.server_priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var obj = root_poa->id_to_reference_i (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ImplementationRepository::ServerObject_var svr = ImplementationRepository::ServerObject::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ()) @@ -3989,7 +3989,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) } CORBA::String_var svr_str = - svr->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER); + svr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Search for "corbaloc:" alone, without the protocol. This code @@ -4015,7 +4015,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) CORBA::String_var curr_addr (svr_str); ImplementationRepository::Administration_var imr_admin = - ImplementationRepository::Administration::_narrow (imr.in ()TAO_ENV_ARG_PARAMETER); + ImplementationRepository::Administration::_narrow (imr.in ()ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (TAO_debug_level > 0) @@ -4026,7 +4026,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL) imr_admin->server_is_running (this->name ().c_str (), curr_addr.in (), svr.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -4065,10 +4065,10 @@ TAO_POA::imr_notify_shutdown (void) { // Get the IMR's administrative object and call shutting_down on it ImplementationRepository::Administration_var imr_admin = - ImplementationRepository::Administration::_narrow (imr.in ()TAO_ENV_ARG_PARAMETER); + ImplementationRepository::Administration::_narrow (imr.in ()ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - imr_admin->server_is_shutting_down (this->the_name ()TAO_ENV_ARG_PARAMETER); + imr_admin->server_is_shutting_down (this->the_name ()ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4082,7 +4082,7 @@ TAO_POA::imr_notify_shutdown (void) #endif /* TAO_HAS_MINIMUM_CORBA */ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa - TAO_ENV_ARG_DECL, + ACE_ENV_ARG_DECL, int check_for_destruction) : guard_ (poa.lock ()) { @@ -4097,7 +4097,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of // course, the thread making the non-servant upcall is this thread. - poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER); + poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (check_for_destruction && @@ -4114,7 +4114,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa PortableServer::ObjectId * TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -4127,7 +4127,7 @@ TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref } PortableServer::ObjectId *obj_id = - hooks->create_id_for_reference (*this, the_ref TAO_ENV_ARG_PARAMETER); + hooks->create_id_for_reference (*this, the_ref ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return obj_id; @@ -4135,7 +4135,7 @@ TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref PortableServer::IDs * TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -4149,7 +4149,7 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref } PortableServer::IDs *id_list = - hooks->reference_to_ids (*this, the_ref TAO_ENV_ARG_PARAMETER); + hooks->reference_to_ids (*this, the_ref ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return id_list; @@ -4158,7 +4158,7 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref void TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -4170,14 +4170,14 @@ TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref, ACE_THROW (CORBA::NO_IMPLEMENT ()); } - hooks->associate_reference_with_id (*this, ref, oid TAO_ENV_ARG_PARAMETER); + hooks->associate_reference_with_id (*this, ref, oid ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -4189,7 +4189,7 @@ TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref, ACE_THROW (CORBA::NO_IMPLEMENT ()); } - hooks->disassociate_reference_with_id (*this, ref, oid TAO_ENV_ARG_PARAMETER); + hooks->disassociate_reference_with_id (*this, ref, oid ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index edc49c0d6e6..513a5673ded 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -148,71 +148,71 @@ public: PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - char * the_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr the_parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAList *the_children (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAManager_ptr the_POAManager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableInterceptor::AdapterManagerId get_manager_id (TAO_ENV_SINGLE_ARG_DECL) + PortableInterceptor::AdapterManagerId get_manager_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // @@ Priyanka, shouldn't this method return a @@ -223,7 +223,7 @@ public: /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - CORBA::StringSeq *adapter_name (TAO_ENV_SINGLE_ARG_DECL) + CORBA::StringSeq *adapter_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// {@ Accessor methods to ObjectReferenceTemplate @@ -231,7 +231,7 @@ public: void set_adapter_template (PortableInterceptor::ObjectReferenceTemplate * object_ref_template - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// @} /// {@ Accessor methods to PortableInterceptor::ObjectReferenceFactory @@ -239,17 +239,17 @@ public: void set_obj_ref_factory (PortableInterceptor::ObjectReferenceFactory * current_factory - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// @} /// Call the establish components. - void tao_establish_components (TAO_ENV_SINGLE_ARG_DECL); + void tao_establish_components (ACE_ENV_SINGLE_ARG_DECL); /// Give each registered IOR interceptor the opportunity to add /// tagged components to profiles of each created servant. void establish_components (PortableInterceptor::IORInfo *info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// TAO_IORInfo requests these members. CORBA::PolicyList *get_policy_list (); @@ -260,115 +260,115 @@ public: // Do you really need it? void save_ior_component (const IOP::TaggedComponent &component - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // @@ Priyanka, this method appears to be very useless and broken. // Do you really need it? void save_ior_component_and_profile_id (const IOP::TaggedComponent &component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::AdapterActivator_ptr the_activator (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ServantManager_ptr get_servant_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); void set_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); void deactivate_object (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference (const char *intf - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::OctetSeq *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) @@ -376,7 +376,7 @@ public: virtual PortableServer::ObjectId * create_id_for_reference ( CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -386,7 +386,7 @@ public: virtual PortableServer::IDs * reference_to_ids ( CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -396,7 +396,7 @@ public: virtual void associate_reference_with_id ( CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -406,7 +406,7 @@ public: virtual void disassociate_reference_with_id ( CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -424,7 +424,7 @@ public: TAO_POA_Cached_Policies &cached_policies (void); virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method gives the policies that are exposed to the client. // These policies are shipped within the IOR. @@ -449,7 +449,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual ~TAO_POA (void); @@ -470,7 +470,7 @@ public: static void check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_ORB_Core &orb_core (void) const; // ORB Core for POA. @@ -485,7 +485,7 @@ public: TAO_Stub* key_to_stub (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Create the correct stub, properly initialized with the attributes // and policies attached to the current POA. @@ -495,7 +495,7 @@ public: /// {@ Accesor methods to POA state. The POA can be in one of /// HOLDING, ACTIVE, DISCARDING, INACTIVE and NON_EXISTENT states. PortableInterceptor::AdapterState - get_adapter_state (TAO_ENV_SINGLE_ARG_DECL); + get_adapter_state (ACE_ENV_SINGLE_ARG_DECL); void set_adapter_state (PortableInterceptor::AdapterState adapter_state, @@ -517,12 +517,12 @@ protected: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); PortableServer::POA_ptr create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); @@ -530,25 +530,25 @@ protected: TAO_POA *create_POA_i (const String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policy_Set &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); TAO_POA *find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL); + void complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL); - PortableServer::POAList *the_children_i (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POAList *the_children_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // @@ Priyanka, shouldn't this method return a @@ -559,7 +559,7 @@ protected: /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - CORBA::StringSeq *adapter_name_i (TAO_ENV_SINGLE_ARG_DECL) + CORBA::StringSeq *adapter_name_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Method to notify the IOR Interceptors when there is a state @@ -574,7 +574,7 @@ protected: /// Add the given tagged component to all profiles. void tao_add_ior_component ( const IOP::TaggedComponent & component - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the given tagged component to all profiles matching the given @@ -582,27 +582,27 @@ protected: void tao_add_ior_component_to_profile ( const IOP::TaggedComponent & component, IOP::ProfileId profile_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ServantManager_ptr get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::ServantManager_ptr get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void set_servant_manager_i (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant_i (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::Servant get_servant_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); void set_servant_i (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -613,7 +613,7 @@ protected: // #if (TAO_HAS_MINIMUM_CORBA == 0) - void imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL); + void imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL); // ImplRepo helper method, notify the ImplRepo on startup void imr_notify_shutdown (void); @@ -624,21 +624,21 @@ protected: CORBA::Object_ptr invoke_key_to_object (const char *intf, PortableServer::ObjectId &user_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); CORBA::Object_ptr key_to_object (const TAO_ObjectKey &key, const char *type_id, TAO_ServantBase *servant, CORBA::Boolean collocated, CORBA::Short priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Wrapper for the ORB's key_to_object that will alter the object pointer // if the ImplRepo is used. virtual TAO_Stub* key_to_stub_i (const TAO_ObjectKey &key, const char *type_id, CORBA::Short priority - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Like key_to_stub() but assume that the ORB is not shutting down. TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key, @@ -646,7 +646,7 @@ protected: CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, TAO_Acceptor_Registry &acceptor_registry - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int is_servant_in_map (PortableServer::Servant servant); @@ -656,7 +656,7 @@ protected: PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); @@ -664,79 +664,79 @@ protected: void activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA::Short priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void wait_for_completions (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); - void check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL); + void check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL); void deactivate_object_i (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); CORBA::Object_ptr create_reference_i (const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid, const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant, CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant, CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); @@ -744,7 +744,7 @@ protected: TAO_Active_Object_Map &active_object_map (void) const; void components_established_i (PortableInterceptor::IORInfo *info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int delete_child (const String &child); @@ -772,13 +772,13 @@ protected: TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id, PortableServer::Servant &servant - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); PortableServer::Servant locate_servant_i (const char *operation, const PortableServer::ObjectId &id, TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_POA_Current_Impl &poa_current_impl - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); const TAO_Creation_Time &creation_time (void); @@ -933,7 +933,7 @@ class TAO_PortableServer_Export TAO_POA_Guard { public: TAO_POA_Guard (TAO_POA &poa - TAO_ENV_ARG_DECL, + ACE_ENV_ARG_DECL, int check_for_destruction = 1); private: @@ -950,7 +950,7 @@ public: CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i index 431b714f202..4967d6a47bf 100644 --- a/TAO/tao/PortableServer/POA.i +++ b/TAO/tao/PortableServer/POA.i @@ -130,7 +130,7 @@ ACE_INLINE PortableServer::POA_ptr TAO_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)) @@ -141,23 +141,23 @@ TAO_POA::create_POA (const char *adapter_name, return this->create_POA_i (adapter_name, poa_manager, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. - TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER, 0); + TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER, 0); ACE_CHECK; ACE_UNUSED_ARG (poa_guard); this->destroy_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE TAO_POA_Policy_Set & @@ -175,19 +175,19 @@ TAO_POA::active_object_map (void) const #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE PortableServer::ServantManager_ptr -TAO_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ()); - return this->get_servant_manager_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->get_servant_manager_i (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE void TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -195,11 +195,11 @@ TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr TAO_POA_GUARD; this->set_servant_manager_i (imgr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::Servant -TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)) @@ -207,12 +207,12 @@ TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL) // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->get_servant_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->get_servant_i (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE void TAO_POA::set_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -220,14 +220,14 @@ TAO_POA::set_servant (PortableServer::Servant servant TAO_POA_GUARD; this->set_servant_i (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ ACE_INLINE PortableServer::ObjectId * TAO_POA::activate_object (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) @@ -237,13 +237,13 @@ TAO_POA::activate_object (PortableServer::Servant servant return this->activate_object_i (servant, this->cached_policies_.server_priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, @@ -255,12 +255,12 @@ TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id, this->activate_object_with_id_i (id, servant, this->cached_policies_.server_priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA::deactivate_object (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -269,12 +269,12 @@ TAO_POA::deactivate_object (const PortableServer::ObjectId &oid TAO_POA_GUARD; this->deactivate_object_i (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object_ptr TAO_POA::create_reference (const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -282,13 +282,13 @@ TAO_POA::create_reference (const char *intf TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); return this->create_reference_i (intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object_ptr TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id, const char *intf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { @@ -297,12 +297,12 @@ TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id, return this->create_reference_with_id_i (id, intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::ObjectId * TAO_POA::servant_to_id (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -313,13 +313,13 @@ TAO_POA::servant_to_id (PortableServer::Servant servant TAO_POA_GUARD_RETURN (0); return this->servant_to_id_i (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::ObjectId * TAO_POA::servant_to_system_id (PortableServer::Servant servant, CORBA::Short &priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) @@ -329,12 +329,12 @@ TAO_POA::servant_to_system_id (PortableServer::Servant servant, return this->servant_to_system_id_i (servant, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::Servant TAO_POA::id_to_servant (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -343,12 +343,12 @@ TAO_POA::id_to_servant (const PortableServer::ObjectId &oid TAO_POA_GUARD_RETURN (0); return this->id_to_servant_i (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object_ptr TAO_POA::id_to_reference (const PortableServer::ObjectId &oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)) @@ -356,11 +356,11 @@ TAO_POA::id_to_reference (const PortableServer::ObjectId &oid // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->id_to_reference_i (oid TAO_ENV_ARG_PARAMETER); + return this->id_to_reference_i (oid ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::POA_ptr -TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->parent_ != 0) @@ -370,24 +370,24 @@ TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } ACE_INLINE PortableServer::POAList * -TAO_POA::the_children (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::the_children (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); - return this->the_children_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->the_children_i (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE PortableServer::POAManager_ptr -TAO_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POAManager::_duplicate (&this->poa_manager_); } ACE_INLINE PortableInterceptor::AdapterManagerId -TAO_POA::get_manager_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::get_manager_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return TAO_POA_Manager::poa_manager_id_; @@ -400,10 +400,10 @@ TAO_POA::get_manager_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // TypeCodes! // ACE_INLINE CORBA::StringSeq * -TAO_POA::adapter_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->adapter_name_i (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * @@ -421,7 +421,7 @@ TAO_POA::get_obj_ref_factory () #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE PortableServer::AdapterActivator_ptr -TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. @@ -432,7 +432,7 @@ TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL) ACE_INLINE void TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. @@ -476,7 +476,7 @@ TAO_POA::name (void) const } ACE_INLINE char * -TAO_POA::the_name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::the_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.c_str ()); @@ -636,7 +636,7 @@ TAO_POA::thread_policy (void) const } ACE_INLINE PortableInterceptor::AdapterState -TAO_POA::get_adapter_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_POA::get_adapter_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->adapter_state_; } diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index 910a43e9dcb..3b6ae064865 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -27,7 +27,7 @@ TAO_POA_Manager::~TAO_POA_Manager (void) } void -TAO_POA_Manager::activate_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { @@ -49,14 +49,14 @@ TAO_POA_Manager::activate_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This operation changes the state of the POA manager to @@ -107,7 +107,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, TAO_POA *poa = *iterator; poa->deactivate_all_objects_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -149,14 +149,14 @@ adapter_manager_state_changed (PortableServer::POAManager::State state, void TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This operation changes the state of the POA manager to @@ -197,7 +197,7 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion { TAO_POA *poa = *iterator; poa->wait_for_completions (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -205,14 +205,14 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion void TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (), wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This operation changes the state of the POA manager to @@ -255,7 +255,7 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion { TAO_POA *poa = *iterator; poa->wait_for_completions (wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index fe3bf6fe9e2..9a862da113d 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -56,31 +56,31 @@ class TAO_PortableServer_Export TAO_POA_Manager : public: - void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); #if (TAO_HAS_MINIMUM_POA == 0) void hold_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void discard_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::POAManager::State get_state (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::POAManager::State get_state (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); TAO_POA_Manager (TAO_Object_Adapter &object_adapter); @@ -89,13 +89,13 @@ public: protected: - void activate_i (TAO_ENV_SINGLE_ARG_DECL) + void activate_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); @@ -103,16 +103,16 @@ protected: /// of POAManager changed. void adapter_manager_state_changed (PortableServer::POAManager::State state, CORBA::Environment &ACE_TRY_ENV); - + #if (TAO_HAS_MINIMUM_POA == 0) void hold_requests_i (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); void discard_requests_i (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)); diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index aec6e34cd32..66f172859ee 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -9,46 +9,46 @@ TAO_POA_Manager::lock (void) } ACE_INLINE void -TAO_POA_Manager::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->activate_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_i (ACE_ENV_SINGLE_ARG_PARAMETER); } #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE void TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->hold_requests_i (wait_for_completion TAO_ENV_ARG_PARAMETER); + this->hold_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->discard_requests_i (wait_for_completion TAO_ENV_ARG_PARAMETER); + this->discard_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { @@ -57,7 +57,7 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, this->deactivate_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -70,7 +70,7 @@ TAO_POA_Manager::get_state_i (void) } ACE_INLINE PortableServer::POAManager::State -TAO_POA_Manager::get_state (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access to the POAManager for the duration of this transaction diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 0ca2e26182c..fd705c3da9e 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -31,33 +31,33 @@ TAO_POA_Cached_Policies::~TAO_POA_Cached_Policies (void) void TAO_POA_Cached_Policies::update (TAO_POA_Policy_Set &policy_set - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++) { CORBA::Policy_var policy = policy_set.get_policy_by_index (i); this->update_policy (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ThreadPolicy_var thread = PortableServer::ThreadPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (thread.in ())) { - this->thread_ = thread->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -67,12 +67,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::LifespanPolicy_var lifespan = PortableServer::LifespanPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (lifespan.in ())) { - this->lifespan_ = lifespan->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -80,12 +80,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::IdUniquenessPolicy_var id_uniqueness = PortableServer::IdUniquenessPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (id_uniqueness.in ())) { - this->id_uniqueness_ = id_uniqueness->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -93,12 +93,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::IdAssignmentPolicy_var id_assignment = PortableServer::IdAssignmentPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (id_assignment.in ())) { - this->id_assignment_ = id_assignment->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -108,12 +108,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::ImplicitActivationPolicy_var implicit_activation = PortableServer::ImplicitActivationPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (implicit_activation.in ())) { - this->implicit_activation_ = implicit_activation->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -121,12 +121,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::ServantRetentionPolicy_var servant_retention = PortableServer::ServantRetentionPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (servant_retention.in ())) { - this->servant_retention_ = servant_retention->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -134,12 +134,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy PortableServer::RequestProcessingPolicy_var request_processing = PortableServer::RequestProcessingPolicy::_narrow (policy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (request_processing.in ())) { - this->request_processing_ = request_processing->value (TAO_ENV_SINGLE_ARG_PARAMETER); + this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index 127439ab984..63569e01b20 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -56,7 +56,7 @@ public: /// Update the cached policy values. void update (TAO_POA_Policy_Set &policy_set - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Accessor methods to cached values. PortableServer::ThreadPolicyValue thread (void) const; @@ -77,7 +77,7 @@ protected: /// Helper method to update a particular policy. void update_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); PortableServer::ThreadPolicyValue thread_; diff --git a/TAO/tao/PortableServer/POA_Policies.cpp b/TAO/tao/PortableServer/POA_Policies.cpp index e72058e4ad5..09078bacb3f 100644 --- a/TAO/tao/PortableServer/POA_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Policies.cpp @@ -17,14 +17,14 @@ TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value) } PortableServer::ThreadPolicyValue -TAO_Thread_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Thread_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Thread_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Thread_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Thread_Policy *thread_policy_copy = 0; @@ -37,13 +37,13 @@ TAO_Thread_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Thread_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Thread_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Thread_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Thread_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::THREAD_POLICY_ID; @@ -71,14 +71,14 @@ TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue va } PortableServer::LifespanPolicyValue -TAO_Lifespan_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Lifespan_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Lifespan_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Lifespan_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Lifespan_Policy *lifespan_policy_copy = 0; @@ -91,13 +91,13 @@ TAO_Lifespan_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Lifespan_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Lifespan_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Lifespan_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Lifespan_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::LIFESPAN_POLICY_ID; @@ -123,14 +123,14 @@ TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniqueness } PortableServer::IdUniquenessPolicyValue -TAO_Id_Uniqueness_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Uniqueness_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Id_Uniqueness_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Id_Uniqueness_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Uniqueness_Policy *id_uniqueness_policy_copy = 0; @@ -143,13 +143,13 @@ TAO_Id_Uniqueness_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Id_Uniqueness_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Uniqueness_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Id_Uniqueness_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Uniqueness_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::ID_UNIQUENESS_POLICY_ID; @@ -175,14 +175,14 @@ TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignment } PortableServer::IdAssignmentPolicyValue -TAO_Id_Assignment_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Assignment_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Id_Assignment_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Id_Assignment_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Assignment_Policy *id_assignment_policy_copy = 0; @@ -195,13 +195,13 @@ TAO_Id_Assignment_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Id_Assignment_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Assignment_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Id_Assignment_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Id_Assignment_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::ID_ASSIGNMENT_POLICY_ID; @@ -229,14 +229,14 @@ TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer:: } PortableServer::ImplicitActivationPolicyValue -TAO_Implicit_Activation_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Implicit_Activation_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Implicit_Activation_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Implicit_Activation_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Implicit_Activation_Policy *implicit_activation_policy_copy = 0; @@ -249,13 +249,13 @@ TAO_Implicit_Activation_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Implicit_Activation_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Implicit_Activation_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Implicit_Activation_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Implicit_Activation_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; @@ -281,14 +281,14 @@ TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::Serv } PortableServer::ServantRetentionPolicyValue -TAO_Servant_Retention_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Servant_Retention_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Servant_Retention_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Servant_Retention_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Servant_Retention_Policy *servant_retention_policy_copy = 0; @@ -301,13 +301,13 @@ TAO_Servant_Retention_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Servant_Retention_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Servant_Retention_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Servant_Retention_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Servant_Retention_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::SERVANT_RETENTION_POLICY_ID; @@ -333,14 +333,14 @@ TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::Re } PortableServer::RequestProcessingPolicyValue -TAO_Request_Processing_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Request_Processing_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr -TAO_Request_Processing_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Request_Processing_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Request_Processing_Policy *request_processing_policy_copy = 0; @@ -353,13 +353,13 @@ TAO_Request_Processing_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Request_Processing_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Request_Processing_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType -TAO_Request_Processing_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Request_Processing_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::REQUEST_PROCESSING_POLICY_ID; diff --git a/TAO/tao/PortableServer/POA_Policies.h b/TAO/tao/PortableServer/POA_Policies.h index 4c47630e2d7..bd9231d99f9 100644 --- a/TAO/tao/PortableServer/POA_Policies.h +++ b/TAO/tao/PortableServer/POA_Policies.h @@ -47,16 +47,16 @@ class TAO_PortableServer_Export TAO_Thread_Policy : public: TAO_Thread_Policy (PortableServer::ThreadPolicyValue value); - PortableServer::ThreadPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ThreadPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -78,16 +78,16 @@ class TAO_PortableServer_Export TAO_Lifespan_Policy : public: TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value); - PortableServer::LifespanPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::LifespanPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -107,16 +107,16 @@ class TAO_PortableServer_Export TAO_Id_Uniqueness_Policy : public: TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value); - PortableServer::IdUniquenessPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::IdUniquenessPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -136,16 +136,16 @@ class TAO_PortableServer_Export TAO_Id_Assignment_Policy : public: TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value); - PortableServer::IdAssignmentPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::IdAssignmentPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -167,16 +167,16 @@ class TAO_PortableServer_Export TAO_Implicit_Activation_Policy : public: TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value); - PortableServer::ImplicitActivationPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ImplicitActivationPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -196,16 +196,16 @@ class TAO_PortableServer_Export TAO_Servant_Retention_Policy : public: TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value); - PortableServer::ServantRetentionPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::ServantRetentionPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. @@ -225,16 +225,16 @@ class TAO_PortableServer_Export TAO_Request_Processing_Policy : public: TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value); - PortableServer::RequestProcessingPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + PortableServer::RequestProcessingPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the cached policy type for this policy. diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 69c388e4aab..9907212b534 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -30,7 +30,7 @@ TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void) void TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong cep_index = client_exposed_policies->length (); @@ -45,7 +45,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client { client_exposed_policies->length (cep_index + 1); (*client_exposed_policies)[cep_index] = - policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; cep_index++; @@ -56,14 +56,14 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client void TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Just give a last chance for all the unloaded validators in other // libraries to be registered orb_core.load_policy_validators (validator); // Validate that all of the specified policies make sense. - validator.validate (this->impl_ TAO_ENV_ARG_PARAMETER); + validator.validate (this->impl_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Verify that all policies are legal for the currently loaded @@ -74,7 +74,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator, { CORBA::Policy_var policy = this->impl_.get_policy_by_index (i); - CORBA::PolicyType type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (validator.legal_policy (type) == 0) diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 06353d178d6..7907df07412 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -58,18 +58,18 @@ public: CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); void merge_policies (const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void merge_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void validate_policies (TAO_Policy_Validator &validator, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Add all of the client exposed policies to the specified list. void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); TAO_Policy_Set &policies (void); diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i index 3cdda2dc2cc..b0a9ec35c10 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.i +++ b/TAO/tao/PortableServer/POA_Policy_Set.i @@ -20,20 +20,20 @@ TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type) ACE_INLINE void TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Add the policies if they don't exist, override them if they do. this->impl_.set_policy_overrides (policies, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_INLINE void TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->impl_.set_policy (policy TAO_ENV_ARG_PARAMETER); + this->impl_.set_policy (policy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 86647b1eae4..0689ed2d10f 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -162,31 +162,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, POA_CORBA_Policy *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::PolicyType result); @@ -204,44 +204,44 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_ TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Policy *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_Policy_policy_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_policy_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_Policy_policy_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_policy_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_Policy_policy_type_get::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_policy_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; @@ -253,7 +253,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (TAO_ENV_SINGLE_ARG_D char * TAO_ServerRequestInfo_CORBA_Policy_policy_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 @@ -263,10 +263,10 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Policy_policy_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 @@ -283,31 +283,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, POA_CORBA_Policy *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::Policy_ptr result); @@ -325,44 +325,44 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Policy *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_Policy_copy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_copy::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_Policy_copy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_copy::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_Policy_copy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_copy::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; @@ -374,7 +374,7 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -384,10 +384,10 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Policy_copy::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 @@ -404,31 +404,31 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, POA_CORBA_Policy *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)); @@ -445,44 +445,44 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_d TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Policy *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_Policy_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_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_Policy_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_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_Policy_destroy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_Policy_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; @@ -490,7 +490,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::result (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo_CORBA_Policy_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 @@ -500,10 +500,10 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Policy_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 */ @@ -536,17 +536,17 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::~POA_CORBA_TAO_Policy_Strategized CORBA_TAO_Policy_Proxy_Impl& POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy ( ::CORBA::Policy *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]; @@ -556,7 +556,7 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy ( void POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -626,7 +626,7 @@ POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -642,7 +642,7 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( _collocated_tao_target_->_object_key (), "policy_type", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -651,13 +651,13 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type ( "IDL:omg.org/CORBA/Policy:1.0" ) )->policy_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -673,7 +673,7 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( _collocated_tao_target_->_object_key (), "copy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -682,13 +682,13 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy ( "IDL:omg.org/CORBA/Policy:1.0" ) )->copy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -702,7 +702,7 @@ void POA_CORBA_TAO_Policy_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 ( @@ -711,7 +711,7 @@ void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy ( "IDL:omg.org/CORBA/Policy:1.0" ) )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -729,7 +729,7 @@ _TAO_CORBA_Policy_Direct_Proxy_Impl::_TAO_CORBA_Policy_Direct_Proxy_Impl (void) CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -739,14 +739,14 @@ CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type ( POA_CORBA_Policy_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") )->policy_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -756,14 +756,14 @@ CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy ( POA_CORBA_Policy_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") )->copy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -773,7 +773,7 @@ void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy ( POA_CORBA_Policy_ptr, _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0") )->destroy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); } @@ -803,7 +803,7 @@ void POA_CORBA_Policy::_get_policy_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_Policy *_tao_impl = @@ -824,18 +824,18 @@ void POA_CORBA_Policy::_get_policy_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->policy_type ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -843,7 +843,7 @@ void POA_CORBA_Policy::_get_policy_type_skel ( CORBA::PolicyType _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 @@ -851,12 +851,12 @@ void POA_CORBA_Policy::_get_policy_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 @@ -883,7 +883,7 @@ void POA_CORBA_Policy::copy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy *_tao_impl = @@ -904,18 +904,18 @@ void POA_CORBA_Policy::copy_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->copy ( - TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -924,7 +924,7 @@ void POA_CORBA_Policy::copy_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 @@ -932,12 +932,12 @@ void POA_CORBA_Policy::copy_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 @@ -965,7 +965,7 @@ void POA_CORBA_Policy::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_Policy *_tao_impl = @@ -986,24 +986,24 @@ void POA_CORBA_Policy::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 @@ -1011,12 +1011,12 @@ void POA_CORBA_Policy::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 @@ -1037,7 +1037,7 @@ void POA_CORBA_Policy::_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 (); @@ -1047,7 +1047,7 @@ void POA_CORBA_Policy::_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 (); @@ -1060,11 +1060,11 @@ void POA_CORBA_Policy::_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_Policy *_tao_impl = (POA_CORBA_Policy *) _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 (); @@ -1077,7 +1077,7 @@ void POA_CORBA_Policy::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference; @@ -1096,7 +1096,7 @@ void POA_CORBA_Policy::_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 (); @@ -1123,10 +1123,10 @@ void POA_CORBA_Policy::_interface_skel ( CORBA::Boolean POA_CORBA_Policy::_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 ( @@ -1148,12 +1148,12 @@ void* POA_CORBA_Policy::_downcast ( return 0; } -void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_Policy::_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); } const char* POA_CORBA_Policy::_interface_repository_id (void) const @@ -1162,9 +1162,9 @@ const char* POA_CORBA_Policy::_interface_repository_id (void) const } CORBA::Policy* -POA_CORBA_Policy::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Policy::_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/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index e89330ca907..1537f13465c 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -64,7 +64,7 @@ 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 @@ 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::Policy *_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::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -115,11 +115,11 @@ TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException @@ -129,11 +129,11 @@ 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 @@ -143,7 +143,7 @@ TAO_ServerRequest &_tao_req, void *_tao_obj, void *_tao_servant_upcall - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); @@ -163,7 +163,7 @@ virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy ( ::CORBA::Policy *object - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); private: @@ -171,7 +171,7 @@ // as soon as their use is necessary. void create_proxy ( int collocation_strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); // Caches the proxy implementations. The proxy implementation @@ -210,7 +210,7 @@ virtual CORBA::PolicyType policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -218,7 +218,7 @@ virtual CORBA::Policy_ptr copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -226,7 +226,7 @@ virtual CORBA::Policy_ptr copy ( virtual void destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -254,7 +254,7 @@ public: virtual CORBA::PolicyType policy_type ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -262,7 +262,7 @@ public: virtual CORBA_Policy_ptr copy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -270,7 +270,7 @@ public: virtual void destroy ( CORBA::Object_ptr _collocated_tao_target_ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index 2c64e99cf90..39647c49710 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -62,24 +62,24 @@ // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); CORBA::Policy_ptr copy ( - 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/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i index 4552a17af9e..2598ef6287b 100644 --- a/TAO/tao/PortableServer/PolicyS_T.i +++ b/TAO/tao/PortableServer/PolicyS_T.i @@ -90,50 +90,50 @@ POA_CORBA_Policy_tie<T>::_is_owner (CORBA::Boolean b) } template <class T> ACE_INLINE PortableServer::POA_ptr -POA_CORBA_Policy_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_Policy_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_Policy::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->POA_CORBA_Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class T> ACE_INLINE CORBA::PolicyType POA_CORBA_Policy_tie<T>::policy_type ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->policy_type ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE CORBA::Policy_ptr POA_CORBA_Policy_tie<T>::copy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { return this->ptr_->copy ( -TAO_ENV_SINGLE_ARG_PARAMETER +ACE_ENV_SINGLE_ARG_PARAMETER ); } template <class T> ACE_INLINE void POA_CORBA_Policy_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/tao/PortableServer/PortableGroup_Hooks.h b/TAO/tao/PortableServer/PortableGroup_Hooks.h index 2103e700efe..d083b9bcda5 100644 --- a/TAO/tao/PortableServer/PortableGroup_Hooks.h +++ b/TAO/tao/PortableServer/PortableGroup_Hooks.h @@ -42,7 +42,7 @@ public: virtual PortableServer::ObjectId * create_id_for_reference ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -52,7 +52,7 @@ public: virtual PortableServer::IDs * reference_to_ids ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -63,7 +63,7 @@ public: TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -74,7 +74,7 @@ public: TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 6e95fd3ad6a..ea2636d8d50 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -106,11 +106,11 @@ void PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, target); - *tmp = PortableServer::POA::_narrow (src TAO_ENV_ARG_PARAMETER); + *tmp = PortableServer::POA::_narrow (src ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -317,7 +317,7 @@ void PortableServer::ForwardRequest::_raise () void PortableServer::ForwardRequest::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -330,7 +330,7 @@ void PortableServer::ForwardRequest::_tao_encode ( void PortableServer::ForwardRequest::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -479,7 +479,7 @@ void PortableServer::NotAGroupObject::_raise () void PortableServer::NotAGroupObject::_tao_encode ( TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { if (cdr << *this) @@ -492,7 +492,7 @@ void PortableServer::NotAGroupObject::_tao_encode ( void PortableServer::NotAGroupObject::_tao_decode ( TAO_InputCDR &cdr - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { if (cdr >> *this) @@ -906,10 +906,10 @@ PortableServer::ThreadPolicy_var::tao_nil (void) ::PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -989,15 +989,15 @@ PortableServer::ThreadPolicy::ThreadPolicy (void) PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ThreadPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ThreadPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1218,10 +1218,10 @@ PortableServer::LifespanPolicy_var::tao_nil (void) ::PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1301,15 +1301,15 @@ PortableServer::LifespanPolicy::LifespanPolicy (void) PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return LifespanPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return LifespanPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1530,10 +1530,10 @@ PortableServer::IdUniquenessPolicy_var::tao_nil (void) ::PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1613,15 +1613,15 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void) PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IdUniquenessPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return IdUniquenessPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1841,10 +1841,10 @@ PortableServer::IdAssignmentPolicy_var::tao_nil (void) ::PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1924,15 +1924,15 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void) PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return IdAssignmentPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return IdAssignmentPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2164,10 +2164,10 @@ PortableServer::ImplicitActivationPolicy_var::tao_nil (void) ::PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2247,15 +2247,15 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void) PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ImplicitActivationPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ImplicitActivationPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2477,10 +2477,10 @@ PortableServer::ServantRetentionPolicy_var::tao_nil (void) ::PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2560,15 +2560,15 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void) PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServantRetentionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServantRetentionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -2804,10 +2804,10 @@ PortableServer::RequestProcessingPolicy_var::tao_nil (void) ::PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2887,15 +2887,15 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void) PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return RequestProcessingPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return RequestProcessingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3069,10 +3069,10 @@ PortableServer::POAManager_var::tao_nil (void) ::PortableServer::POAManager_ptr PortableServer::POAManager_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3152,15 +3152,15 @@ PortableServer::POAManager::POAManager (void) PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return POAManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return POAManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::POAManager_ptr PortableServer::POAManager::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3255,7 +3255,7 @@ void PortableServer::POAManager::AdapterInactive::_raise () void PortableServer::POAManager::AdapterInactive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -3263,7 +3263,7 @@ void PortableServer::POAManager::AdapterInactive::_tao_encode ( void PortableServer::POAManager::AdapterInactive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -3390,10 +3390,10 @@ PortableServer::AdapterActivator_var::tao_nil (void) ::PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3473,15 +3473,15 @@ PortableServer::AdapterActivator::AdapterActivator (void) PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return AdapterActivator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return AdapterActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3641,10 +3641,10 @@ PortableServer::ServantManager_var::tao_nil (void) ::PortableServer::ServantManager_ptr PortableServer::ServantManager_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3724,15 +3724,15 @@ PortableServer::ServantManager::ServantManager (void) PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServantManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServantManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ServantManager_ptr PortableServer::ServantManager::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3892,10 +3892,10 @@ PortableServer::ServantActivator_var::tao_nil (void) ::PortableServer::ServantActivator_ptr PortableServer::ServantActivator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3975,15 +3975,15 @@ PortableServer::ServantActivator::ServantActivator (void) PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServantActivator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServantActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4155,10 +4155,10 @@ PortableServer::ServantLocator_var::tao_nil (void) ::PortableServer::ServantLocator_ptr PortableServer::ServantLocator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4238,15 +4238,15 @@ PortableServer::ServantLocator::ServantLocator (void) PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ServantLocator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return ServantLocator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4420,10 +4420,10 @@ PortableServer::POA_var::tao_nil (void) ::PortableServer::POA_ptr PortableServer::POA_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4503,15 +4503,15 @@ PortableServer::POA::POA (void) PortableServer::POA_ptr PortableServer::POA::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return POA::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr PortableServer::POA::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -4606,7 +4606,7 @@ void PortableServer::POA::AdapterAlreadyExists::_raise () void PortableServer::POA::AdapterAlreadyExists::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4614,7 +4614,7 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_encode ( void PortableServer::POA::AdapterAlreadyExists::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4674,7 +4674,7 @@ void PortableServer::POA::AdapterNonExistent::_raise () void PortableServer::POA::AdapterNonExistent::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4682,7 +4682,7 @@ void PortableServer::POA::AdapterNonExistent::_tao_encode ( void PortableServer::POA::AdapterNonExistent::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4744,7 +4744,7 @@ void PortableServer::POA::InvalidPolicy::_raise () void PortableServer::POA::InvalidPolicy::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4752,7 +4752,7 @@ void PortableServer::POA::InvalidPolicy::_tao_encode ( void PortableServer::POA::InvalidPolicy::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4822,7 +4822,7 @@ void PortableServer::POA::NoServant::_raise () void PortableServer::POA::NoServant::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4830,7 +4830,7 @@ void PortableServer::POA::NoServant::_tao_encode ( void PortableServer::POA::NoServant::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4892,7 +4892,7 @@ void PortableServer::POA::ObjectAlreadyActive::_raise () void PortableServer::POA::ObjectAlreadyActive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4900,7 +4900,7 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_encode ( void PortableServer::POA::ObjectAlreadyActive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -4960,7 +4960,7 @@ void PortableServer::POA::ObjectNotActive::_raise () void PortableServer::POA::ObjectNotActive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -4968,7 +4968,7 @@ void PortableServer::POA::ObjectNotActive::_tao_encode ( void PortableServer::POA::ObjectNotActive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5028,7 +5028,7 @@ void PortableServer::POA::ServantAlreadyActive::_raise () void PortableServer::POA::ServantAlreadyActive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5036,7 +5036,7 @@ void PortableServer::POA::ServantAlreadyActive::_tao_encode ( void PortableServer::POA::ServantAlreadyActive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5096,7 +5096,7 @@ void PortableServer::POA::ServantNotActive::_raise () void PortableServer::POA::ServantNotActive::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5104,7 +5104,7 @@ void PortableServer::POA::ServantNotActive::_tao_encode ( void PortableServer::POA::ServantNotActive::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5164,7 +5164,7 @@ void PortableServer::POA::WrongAdapter::_raise () void PortableServer::POA::WrongAdapter::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5172,7 +5172,7 @@ void PortableServer::POA::WrongAdapter::_tao_encode ( void PortableServer::POA::WrongAdapter::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5232,7 +5232,7 @@ void PortableServer::POA::WrongPolicy::_raise () void PortableServer::POA::WrongPolicy::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5240,7 +5240,7 @@ void PortableServer::POA::WrongPolicy::_tao_encode ( void PortableServer::POA::WrongPolicy::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5365,10 +5365,10 @@ PortableServer::Current_var::tao_nil (void) ::PortableServer::Current_ptr PortableServer::Current_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -5448,15 +5448,15 @@ PortableServer::Current::Current (void) PortableServer::Current_ptr PortableServer::Current::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } PortableServer::Current_ptr PortableServer::Current::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -5563,7 +5563,7 @@ void PortableServer::Current::NoContext::_raise () void PortableServer::Current::NoContext::_tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) const { ACE_THROW (CORBA::MARSHAL ()); @@ -5571,7 +5571,7 @@ void PortableServer::Current::NoContext::_tao_encode ( void PortableServer::Current::NoContext::_tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_THROW (CORBA::MARSHAL ()); @@ -5654,7 +5654,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Ob { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5742,7 +5742,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5836,7 +5836,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::No { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5931,7 +5931,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ID { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -5998,7 +5998,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPo { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6047,7 +6047,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Lifespan { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6094,7 +6094,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUnique { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6141,7 +6141,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssign { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6190,7 +6190,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Implicit { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6237,7 +6237,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantR { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -6284,7 +6284,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestP { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue TAO_ENV_ARG_PARAMETER); + CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 2a8a99638b8..393d325abe2 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -116,7 +116,7 @@ TAO_NAMESPACE PortableServer static POA_ptr tao_nil (void); static POA_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -201,7 +201,7 @@ TAO_NAMESPACE PortableServer virtual void _downcast ( void* target, CORBA_Object *src - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); virtual CORBA_Object* _upcast (void *src) const; }; @@ -467,12 +467,12 @@ TAO_NAMESPACE PortableServer virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ForwardRequest *_downcast (CORBA::Exception *); @@ -519,12 +519,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NotAGroupObject *_downcast (CORBA::Exception *); @@ -771,7 +771,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ThreadPolicy_ptr tao_nil (void); static ThreadPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -829,12 +829,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ThreadPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ThreadPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ThreadPolicy_ptr _nil (void) @@ -843,7 +843,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ThreadPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -918,7 +918,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static LifespanPolicy_ptr tao_nil (void); static LifespanPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -976,12 +976,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static LifespanPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static LifespanPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static LifespanPolicy_ptr _nil (void) @@ -990,7 +990,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::LifespanPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1063,7 +1063,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static IdUniquenessPolicy_ptr tao_nil (void); static IdUniquenessPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1121,12 +1121,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static IdUniquenessPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IdUniquenessPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IdUniquenessPolicy_ptr _nil (void) @@ -1135,7 +1135,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::IdUniquenessPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1208,7 +1208,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static IdAssignmentPolicy_ptr tao_nil (void); static IdAssignmentPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1266,12 +1266,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static IdAssignmentPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IdAssignmentPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IdAssignmentPolicy_ptr _nil (void) @@ -1280,7 +1280,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::IdAssignmentPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1355,7 +1355,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ImplicitActivationPolicy_ptr tao_nil (void); static ImplicitActivationPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1413,12 +1413,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ImplicitActivationPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ImplicitActivationPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ImplicitActivationPolicy_ptr _nil (void) @@ -1427,7 +1427,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ImplicitActivationPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1504,7 +1504,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantRetentionPolicy_ptr tao_nil (void); static ServantRetentionPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1562,12 +1562,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantRetentionPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantRetentionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantRetentionPolicy_ptr _nil (void) @@ -1576,7 +1576,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::ServantRetentionPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1654,7 +1654,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static RequestProcessingPolicy_ptr tao_nil (void); static RequestProcessingPolicy_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1712,12 +1712,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static RequestProcessingPolicy_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static RequestProcessingPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static RequestProcessingPolicy_ptr _nil (void) @@ -1726,7 +1726,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; } virtual ::PortableServer::RequestProcessingPolicyValue value ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1791,7 +1791,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static POAManager_ptr tao_nil (void); static POAManager_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -1849,12 +1849,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static POAManager_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static POAManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static POAManager_ptr _nil (void) @@ -1885,12 +1885,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AdapterInactive *_downcast (CORBA::Exception *); @@ -1913,7 +1913,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; typedef State &State_out; virtual void activate ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1923,7 +1923,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual void hold_requests ( - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1931,7 +1931,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void discard_requests ( - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1940,7 +1940,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void deactivate ( CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -1950,7 +1950,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::POAManager::State get_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2015,7 +2015,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static AdapterActivator_ptr tao_nil (void); static AdapterActivator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2073,12 +2073,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static AdapterActivator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static AdapterActivator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static AdapterActivator_ptr _nil (void) @@ -2088,7 +2088,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, - const char * name TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2152,7 +2152,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantManager_ptr tao_nil (void); static ServantManager_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2210,12 +2210,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantManager_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantManager_ptr _nil (void) @@ -2281,7 +2281,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantActivator_ptr tao_nil (void); static ServantActivator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2339,12 +2339,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantActivator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantActivator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantActivator_ptr _nil (void) @@ -2354,7 +2354,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual ::PortableServer::Servant incarnate ( const PortableServer::ObjectId & oid, - PortableServer::POA_ptr adapter TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::POA_ptr adapter ACE_ENV_ARG_DECL_WITH_DEFAULTS ) #if (TAO_HAS_MINIMUM_CORBA == 0) ACE_THROW_SPEC (( @@ -2372,7 +2372,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean remaining_activations ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2436,7 +2436,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantLocator_ptr tao_nil (void); static ServantLocator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2497,12 +2497,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static ServantLocator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantLocator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServantLocator_ptr _nil (void) @@ -2514,7 +2514,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, const char * operation, - PortableServer::ServantLocator::Cookie & the_cookie TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantLocator::Cookie & the_cookie ACE_ENV_ARG_DECL_WITH_DEFAULTS ) #if (TAO_HAS_MINIMUM_CORBA == 0) ACE_THROW_SPEC (( @@ -2532,7 +2532,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; PortableServer::POA_ptr adapter, const char * operation, PortableServer::ServantLocator::Cookie the_cookie, - PortableServer::Servant the_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant the_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2596,7 +2596,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static POA_ptr tao_nil (void); static POA_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -2655,12 +2655,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static POA_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static POA_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static POA_ptr _nil (void) @@ -2695,12 +2695,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AdapterAlreadyExists *_downcast (CORBA::Exception *); @@ -2736,12 +2736,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static AdapterNonExistent *_downcast (CORBA::Exception *); @@ -2778,12 +2778,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static InvalidPolicy *_downcast (CORBA::Exception *); @@ -2823,12 +2823,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NoServant *_downcast (CORBA::Exception *); @@ -2865,12 +2865,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ObjectAlreadyActive *_downcast (CORBA::Exception *); @@ -2906,12 +2906,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ObjectNotActive *_downcast (CORBA::Exception *); @@ -2947,12 +2947,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ServantAlreadyActive *_downcast (CORBA::Exception *); @@ -2988,12 +2988,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static ServantNotActive *_downcast (CORBA::Exception *); @@ -3029,12 +3029,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static WrongAdapter *_downcast (CORBA::Exception *); @@ -3070,12 +3070,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static WrongPolicy *_downcast (CORBA::Exception *); @@ -3091,7 +3091,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual ::PortableServer::POA_ptr create_POA ( const char * adapter_name, PortableServer::POAManager_ptr a_POAManager, - const CORBA::PolicyList & policies TAO_ENV_ARG_DECL_WITH_DEFAULTS + const CORBA::PolicyList & policies ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3101,7 +3101,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual ::PortableServer::POA_ptr find_POA ( const char * adapter_name, - CORBA::Boolean activate_it TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean activate_it ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3110,7 +3110,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void destroy ( CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3119,7 +3119,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy ( - PortableServer::ThreadPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ThreadPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3128,21 +3128,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy ( - PortableServer::LifespanPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::LifespanPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( - PortableServer::IdUniquenessPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::IdUniquenessPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( - PortableServer::IdAssignmentPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::IdAssignmentPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3151,21 +3151,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( - PortableServer::ImplicitActivationPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ImplicitActivationPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( - PortableServer::ServantRetentionPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantRetentionPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( - PortableServer::RequestProcessingPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::RequestProcessingPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3174,28 +3174,28 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual char * the_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::POA_ptr the_parent ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::POAList * the_children ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::POAManager_ptr the_POAManager ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3204,21 +3204,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::AdapterActivator_ptr the_activator ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual void the_activator ( - PortableServer::AdapterActivator_ptr the_activator TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::AdapterActivator_ptr the_activator ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; virtual ::PortableServer::ServantManager_ptr get_servant_manager ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3226,7 +3226,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void set_servant_manager ( - PortableServer::ServantManager_ptr imgr TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::ServantManager_ptr imgr ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3234,7 +3234,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::Servant get_servant ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3243,7 +3243,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void set_servant ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3253,7 +3253,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ::PortableServer::ObjectId * activate_object ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3263,7 +3263,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void activate_object_with_id ( const PortableServer::ObjectId & id, - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3273,7 +3273,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual void deactivate_object ( - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3282,7 +3282,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual CORBA::Object_ptr create_reference ( - const char * intf TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3291,7 +3291,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId & oid, - const char * intf TAO_ENV_ARG_DECL_WITH_DEFAULTS + const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3299,7 +3299,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::ObjectId * servant_to_id ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3308,7 +3308,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual CORBA::Object_ptr servant_to_reference ( - PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS + PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3317,7 +3317,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::Servant reference_to_servant ( - CORBA::Object_ptr reference TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3327,7 +3327,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::ObjectId * reference_to_id ( - CORBA::Object_ptr reference TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3336,7 +3336,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3345,7 +3345,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual CORBA::Object_ptr id_to_reference ( - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3354,7 +3354,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::CORBA::OctetSeq * id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3363,7 +3363,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ObjectId * create_id_for_reference ( - CORBA::Object_ptr the_ref TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3371,7 +3371,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::IDs * reference_to_ids ( - CORBA::Object_ptr the_ref TAO_ENV_ARG_DECL_WITH_DEFAULTS + CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3380,7 +3380,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void associate_reference_with_id ( CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3389,7 +3389,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void disassociate_reference_with_id ( CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS + const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3456,7 +3456,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static Current_ptr tao_nil (void); static Current_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -3514,12 +3514,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; static Current_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static Current_ptr _nil (void) @@ -3550,12 +3550,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; virtual void _tao_encode ( TAO_OutputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) const; virtual void _tao_decode ( TAO_InputCDR & - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static NoContext *_downcast (CORBA::Exception *); @@ -3569,7 +3569,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; #endif /* end #if !defined */ virtual ::PortableServer::POA_ptr get_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -3577,7 +3577,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject; )) = 0; virtual ::PortableServer::ObjectId * get_object_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i index ceea3c99d27..4023c0925a5 100644 --- a/TAO/tao/PortableServer/PortableServerC.i +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -1061,10 +1061,10 @@ tao_PortableServer_ThreadPolicy_nil ( ACE_INLINE PortableServer::ThreadPolicy_ptr tao_PortableServer_ThreadPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1112,10 +1112,10 @@ tao_PortableServer_LifespanPolicy_nil ( ACE_INLINE PortableServer::LifespanPolicy_ptr tao_PortableServer_LifespanPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1161,10 +1161,10 @@ tao_PortableServer_IdUniquenessPolicy_nil ( ACE_INLINE PortableServer::IdUniquenessPolicy_ptr tao_PortableServer_IdUniquenessPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1210,10 +1210,10 @@ tao_PortableServer_IdAssignmentPolicy_nil ( ACE_INLINE PortableServer::IdAssignmentPolicy_ptr tao_PortableServer_IdAssignmentPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1261,10 +1261,10 @@ tao_PortableServer_ImplicitActivationPolicy_nil ( ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr tao_PortableServer_ImplicitActivationPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1310,10 +1310,10 @@ tao_PortableServer_ServantRetentionPolicy_nil ( ACE_INLINE PortableServer::ServantRetentionPolicy_ptr tao_PortableServer_ServantRetentionPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1359,10 +1359,10 @@ tao_PortableServer_RequestProcessingPolicy_nil ( ACE_INLINE PortableServer::RequestProcessingPolicy_ptr tao_PortableServer_RequestProcessingPolicy_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1414,10 +1414,10 @@ tao_PortableServer_POAManager_nil ( ACE_INLINE PortableServer::POAManager_ptr tao_PortableServer_POAManager_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1465,10 +1465,10 @@ tao_PortableServer_AdapterActivator_nil ( ACE_INLINE PortableServer::AdapterActivator_ptr tao_PortableServer_AdapterActivator_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1514,10 +1514,10 @@ tao_PortableServer_ServantManager_nil ( ACE_INLINE PortableServer::ServantManager_ptr tao_PortableServer_ServantManager_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1563,10 +1563,10 @@ tao_PortableServer_ServantActivator_nil ( ACE_INLINE PortableServer::ServantActivator_ptr tao_PortableServer_ServantActivator_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1612,10 +1612,10 @@ tao_PortableServer_ServantLocator_nil ( ACE_INLINE PortableServer::ServantLocator_ptr tao_PortableServer_ServantLocator_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1703,10 +1703,10 @@ tao_PortableServer_POA_nil ( ACE_INLINE PortableServer::POA_ptr tao_PortableServer_POA_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * @@ -1756,10 +1756,10 @@ tao_PortableServer_Current_nil ( ACE_INLINE PortableServer::Current_ptr tao_PortableServer_Current_narrow ( - CORBA::Object *p TAO_ENV_ARG_DECL + CORBA::Object *p ACE_ENV_ARG_DECL ) { - return PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object * diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 43448eb0b26..fdfb09c078d 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -64,21 +64,21 @@ TAO_ServantBase::~TAO_ServantBase (void) } PortableServer::POA_ptr -TAO_ServantBase::_default_POA (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var object = - TAO_ORB_Core_instance ()->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_ORB_Core_instance ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); return PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_ServantBase::_is_a (const char* logical_type_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - const char *id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (logical_type_id, id) == 0) @@ -90,13 +90,13 @@ TAO_ServantBase::_is_a (const char* logical_type_id } CORBA::Boolean -TAO_ServantBase::_non_existent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServantBase::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } CORBA_InterfaceDef_ptr -TAO_ServantBase::_get_interface (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL) { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -111,7 +111,7 @@ TAO_ServantBase::_get_interface (TAO_ENV_SINGLE_ARG_DECL) return adapter->get_interface (TAO_ORB_Core_instance ()->orb (), this->_interface_repository_id () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int @@ -131,7 +131,7 @@ TAO_ServantBase::_bind (const char *opname, } TAO_Stub * -TAO_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) { TAO_Stub *stub = 0; @@ -151,15 +151,15 @@ TAO_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL) poa_current_impl->object_key (), this->_interface_repository_id (), poa_current_impl->priority () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else { - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::Object_var object = poa->servant_to_reference (this TAO_ENV_ARG_PARAMETER); + CORBA::Object_var object = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the stub object @@ -180,7 +180,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch ( TAO_ServerRequest &req, void *servant_upcall, void *derived_this - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) //CORBA::Environment &ACE_TRY_ENV @@ -223,7 +223,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch ( // Invoke the skeleton, it will demarshal the arguments, // invoke the right operation on the skeleton class // (<derived_this>), and marshal any results. - skel (req, derived_this, servant_upcall TAO_ENV_ARG_PARAMETER); //, ACE_TRY_ENV); + skel (req, derived_this, servant_upcall ACE_ENV_ARG_PARAMETER); //, ACE_TRY_ENV); ACE_TRY_CHECK; // It is our job to send the already marshaled reply, but only @@ -266,7 +266,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch ( TAO_ServerRequest &req, void *servant_upcall, void *derived_this - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL // CORBA::Environment &ACE_TRY_ENV ) { @@ -306,7 +306,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch ( // Invoke the skeleton, it will demarshal the arguments, // invoke the right operation on the skeleton class // (<derived_this>), and marshal any results. - skel (req, derived_this, servant_upcall TAO_ENV_ARG_PARAMETER); + skel (req, derived_this, servant_upcall ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // It is our job to send the already marshaled reply, but only @@ -351,13 +351,13 @@ TAO_RefCountServantBase::~TAO_RefCountServantBase (void) } void -TAO_RefCountServantBase::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RefCountServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ++this->ref_count_; } void -TAO_RefCountServantBase::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RefCountServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { CORBA::ULong new_count = --this->ref_count_; @@ -485,7 +485,7 @@ TAO_ServantBase_var::_retn (void) void TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::BAD_OPERATION ()); } diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 7604d668c08..4dcc688c811 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -47,30 +47,30 @@ public: // Destructor. virtual PortableServer::POA_ptr _default_POA ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Returns the default POA for this servant. virtual CORBA::Boolean _is_a (const char* logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Local implementation of the CORBA::Object::_is_a method. - virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Default <_non_existent>: always returns false. virtual CORBA_InterfaceDef_ptr _get_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual void *_downcast (const char *repository_id) = 0; // Get the correct vtable. - virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL); // This is an auxiliar method for _this() and _narrow(). virtual void _dispatch (TAO_ServerRequest &request, void *servant_upcall - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Dispatches a request to the object: find the operation, cast the // type to the most derived type, demarshall all the parameters from // the request and finally invokes the operation, storing the @@ -93,12 +93,12 @@ protected: void *servant_upcall, void *derived_this // CORBA::Environment &ACE_TRY_ENV); - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void asynchronous_upcall_dispatch (TAO_ServerRequest &req, void *servant_upcall, void *derived_this - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //CORBA::Environment &ACE_TRY_ENV); virtual int _find (const char *opname, @@ -153,10 +153,10 @@ public: ~TAO_RefCountServantBase (void); // Destructor. - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Increase reference count by one. - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Decreases reference count by one; if the resulting reference // count equals zero, _remove_ref invokes delete on its this pointer // in order to destroy the servant. @@ -241,13 +241,13 @@ class TAO_PortableServer_Export TAO_Local_ServantBase // registered with the POA. // protected: - TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // This is an auxiliar method for _this(). Make sure *not* to // register with the default POA. void _dispatch (TAO_ServerRequest &request, void *servant_upcall - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Throws CORBA::BAD_OPERATION exception. }; diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i index d8478e202b0..2037908841a 100644 --- a/TAO/tao/PortableServer/Servant_Base.i +++ b/TAO/tao/PortableServer/Servant_Base.i @@ -7,7 +7,7 @@ TAO_Servant_Hash::operator () (PortableServer::Servant servant) const } ACE_INLINE TAO_Stub * -TAO_Local_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL) +TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL) { #if 0 PortableServer::ObjectId_var invalid_oid = @@ -27,10 +27,10 @@ TAO_Local_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL) // the creation of a local stub, hence causing a infinite loop. return TAO_ORB_Core_instance ()->orb ()->create_stub_object (tmp_key, this->_interface_repository_id () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else # if !defined (ACE_HAS_EXCEPTIONS) - ACE_UNUSED_ARG (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_UNUSED_ARG (ACE_ENV_SINGLE_ARG_PARAMETER); #endif return 0; #endif diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index 15b3b623328..eaeb04bc7e2 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -44,7 +44,7 @@ public: /// Dispatch the request to the servant. virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall, TAO_ServerRequest &req - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Factory method for creating new POA's. virtual TAO_POA *create_POA (const ACE_CString &name, @@ -55,7 +55,7 @@ public: TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp index 5927d4fcbe0..b862fca42d2 100644 --- a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp @@ -25,7 +25,7 @@ void TAO_ServerRequestInterceptor_Adapter:: receive_request_service_contexts ( TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method implements one of the "starting" server side // interception point. @@ -43,7 +43,7 @@ receive_request_service_contexts ( { this->interceptors_[i]->receive_request_service_contexts ( ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The starting interception point completed successfully. @@ -55,7 +55,7 @@ receive_request_service_contexts ( { ri->forward_reference (exc); this->send_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->location_forwarded_ = 1; @@ -67,7 +67,7 @@ receive_request_service_contexts ( void TAO_ServerRequestInterceptor_Adapter:: receive_request (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This method implements an "intermediate" server side interception // point. Interceptors are invoked in the same order they were @@ -91,7 +91,7 @@ receive_request (TAO_ServerRequestInfo *ri for (size_t i = 0; i < this->stack_size_; ++i) { this->interceptors_[i]->receive_request (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Note that no interceptors are pushed on to or popped off @@ -103,7 +103,7 @@ receive_request (TAO_ServerRequestInfo *ri { ri->forward_reference (exc); this->send_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->location_forwarded_ = 1; @@ -116,7 +116,7 @@ receive_request (TAO_ServerRequestInfo *ri void TAO_ServerRequestInterceptor_Adapter:: send_reply (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. @@ -137,7 +137,7 @@ send_reply (TAO_ServerRequestInfo *ri this->interceptors_[this->stack_size_]->send_reply ( ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -149,7 +149,7 @@ send_reply (TAO_ServerRequestInfo *ri void TAO_ServerRequestInterceptor_Adapter:: send_exception (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. @@ -172,7 +172,7 @@ send_exception (TAO_ServerRequestInfo *ri this->interceptors_[this->stack_size_]->send_exception ( ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -180,7 +180,7 @@ send_exception (TAO_ServerRequestInfo *ri { ri->forward_reference (exc); this->send_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->location_forwarded_ = 1; @@ -199,11 +199,11 @@ send_exception (TAO_ServerRequestInfo *ri ri->exception (&ACE_ANY_EXCEPTION); - this->send_exception (ri TAO_ENV_ARG_PARAMETER); + this->send_exception (ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus status = - ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); + ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Only re-throw the exception if it hasn't been transformed by @@ -220,7 +220,7 @@ send_exception (TAO_ServerRequestInfo *ri void TAO_ServerRequestInterceptor_Adapter:: send_other (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. @@ -243,7 +243,7 @@ send_other (TAO_ServerRequestInfo *ri this->interceptors_[this->stack_size_]->send_other ( ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -251,7 +251,7 @@ send_other (TAO_ServerRequestInfo *ri { ri->forward_reference (exc); this->send_other (ri - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->location_forwarded_ = 1; diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.h b/TAO/tao/PortableServer/ServerInterceptorAdapter.h index 03aab708e15..04678976caf 100644 --- a/TAO/tao/PortableServer/ServerInterceptorAdapter.h +++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.h @@ -71,26 +71,26 @@ public: /// point. void receive_request_service_contexts ( TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method an "intermediate" server side interception point. void receive_request (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" server side /// interception points. void send_reply (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" server side /// interception points. void send_exception (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// This method implements one of the "ending" server side /// interception points. void send_other (TAO_ServerRequestInfo *ri - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@} /// Returns true if a LOCATION_FORWARD was generated, and false diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp index 4dea2e6e54b..bf2bb46aec5 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.cpp +++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp @@ -33,7 +33,7 @@ TAO_ServerRequestInfo::TAO_ServerRequestInfo ( } CORBA::ULong -TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // The request ID returned by this method need not correspond to the @@ -76,14 +76,14 @@ TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_ServerRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->server_request_.operation ()); } Dynamic::ParameterList * -TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -92,7 +92,7 @@ TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ExceptionList * -TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -101,7 +101,7 @@ TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::ContextList * -TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -110,7 +110,7 @@ TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL) } Dynamic::RequestContext * -TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -119,7 +119,7 @@ TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Any * -TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, @@ -128,7 +128,7 @@ TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Boolean -TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->server_request_.response_expected (); @@ -136,7 +136,7 @@ TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) # if TAO_HAS_CORBA_MESSAGING == 1 Messaging::SyncScope -TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->server_request_.sync_with_server ()) @@ -149,7 +149,7 @@ TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL) #endif /* TAO_HAS_CORBA_MESSAGING */ PortableInterceptor::ReplyStatus -TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ == -1) @@ -162,7 +162,7 @@ TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD) @@ -177,7 +177,7 @@ TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -189,20 +189,20 @@ TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id if (pi_current == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), 0); - pi_current->check_validity (id TAO_ENV_ARG_PARAMETER); + pi_current->check_validity (id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Retrieve the request scope PICurrent object. TAO_PICurrent_Impl &rsc = this->server_request_.rs_pi_current (); - return rsc.get_slot (id TAO_ENV_ARG_PARAMETER); + return rsc.get_slot (id ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ServerRequestInfo::get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Service_Context &service_context_list = @@ -210,13 +210,13 @@ TAO_ServerRequestInfo::get_request_service_context ( return this->get_service_context_i (service_context_list, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ServerRequestInfo::get_reply_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Service_Context &service_context_list = @@ -224,14 +224,14 @@ TAO_ServerRequestInfo::get_reply_service_context ( return this->get_service_context_i (service_context_list, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } IOP::ServiceContext * TAO_ServerRequestInfo::get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create a new service context to be returned. Assume @@ -267,7 +267,7 @@ TAO_ServerRequestInfo::get_service_context_i ( // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO_ServerRequestInfo::sending_exception (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION @@ -304,14 +304,14 @@ TAO_ServerRequestInfo::sending_exception (TAO_ENV_SINGLE_ARG_DECL) // = TAO specific method done since there currently is no simple way // to extract exceptions from an Any CORBA::Exception * -TAO_ServerRequestInfo::_sending_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ServerRequestInfo::_sending_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->caught_exception_; } char * -TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -325,7 +325,7 @@ TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL) } char * -TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -338,7 +338,7 @@ TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL) } PortableInterceptor::AdapterName * -TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Fill in later @@ -354,7 +354,7 @@ TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL) { CORBA::StringSeq *adapter_name = 0; adapter_name = - this->servant_upcall_->poa ().adapter_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->servant_upcall_->poa ().adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return adapter_name; @@ -366,7 +366,7 @@ TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL) } CORBA::OctetSeq * -TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) @@ -409,11 +409,11 @@ TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL) } CORBA::OctetSeq * -TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->servant_upcall_ != 0) - return this->servant_upcall_->poa ().id (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->servant_upcall_->poa ().id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, CORBA::COMPLETED_NO), @@ -422,7 +422,7 @@ TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL) char * TAO_ServerRequestInfo::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Implemented in the generated skeleton. @@ -434,7 +434,7 @@ TAO_ServerRequestInfo::target_most_derived_interface ( CORBA::Policy_ptr TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Currently, it is only possible to retrieve the server policy @@ -458,7 +458,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type // object reference!!! CORBA::Policy_var policy = policies.get_policy_by_index (i); - CORBA::PolicyType ptype = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType ptype = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); if (ptype == type) @@ -482,7 +482,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type void TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, const CORBA::Any &data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)) { @@ -494,7 +494,7 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, if (pi_current == 0) ACE_THROW (CORBA::INTERNAL ()); - pi_current->check_validity (id TAO_ENV_ARG_PARAMETER); + pi_current->check_validity (id ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Retrieve the "request scope current" (RSC). @@ -507,13 +507,13 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, if (tsc != 0) tsc->copy (rsc, 1); // Deep copy - rsc.set_slot (id, data TAO_ENV_ARG_PARAMETER); + rsc.set_slot (id, data ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Boolean TAO_ServerRequestInfo::target_is_a (const char * /* id */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Implemented in the generated skeleton. @@ -526,7 +526,7 @@ void TAO_ServerRequestInfo::add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the service context from the list diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h index 3bd363ad2bd..bf2d856464b 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.h +++ b/TAO/tao/PortableServer/ServerRequestInfo.h @@ -65,43 +65,43 @@ public: /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. virtual CORBA::ULong request_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the operation name for the current request. virtual char * operation ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of arguments passed to the current operation. virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of exceptions the current operation is capable /// of throwing. virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ContextList * contexts ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::RequestContext * operation_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the result of the current request. If there is no return /// value then an Any with tk_void TypeCode is returned. This is /// method is not valid for oneway operations. virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns true for a two-way operation, and false otherwis.e virtual CORBA::Boolean response_expected ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) ; #if TAO_HAS_CORBA_MESSAGING == 1 @@ -109,7 +109,7 @@ public: /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. virtual Messaging::SyncScope sync_scope ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_CORBA_MESSAGING */ @@ -118,20 +118,20 @@ public: /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT, /// TRANSPORT_RETRY. virtual PortableInterceptor::ReplyStatus reply_status ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the /// object reference to which the request was forwarded. virtual CORBA::Object_ptr forward_reference ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) ; /// Retrieve data from the "request scope" PICurrent object. virtual CORBA::Any * get_slot ( PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -139,14 +139,14 @@ public: /// from the request service context list. virtual IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the IOP::ServiceContext with the given IOP::ServiceId /// from the reply service context list. virtual IOP::ServiceContext * get_reply_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return an Any containing the exception being sent, if any. @@ -155,7 +155,7 @@ public: * @note There is no trivial way to extract the exception from an Any. */ virtual CORBA::Any * sending_exception ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -164,51 +164,51 @@ public: * possible. */ virtual CORBA::Exception * _sending_exception ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the ObjectId for the target object. virtual CORBA::OctetSeq * object_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the AdapterId for the POA handling the current request. virtual CORBA::OctetSeq * adapter_id ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the server_id of the server. The value is passed to /// the ORB via -ORBServerId parameter. - virtual char * server_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the ORBId value that is passed to the ORB::Init call. - virtual char * orb_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the name of the object adapter that services requests for /// the invoked object. virtual PortableInterceptor::AdapterName * adapter_name ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + /// Return the most derived interface of the target object. 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)); /// Return the policy of the given type in effect for the current /// request. virtual CORBA::Policy_ptr get_server_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Insert data into the "request scope" PICurrent object. virtual void set_slot ( PortableInterceptor::SlotId id, const CORBA::Any & data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -216,7 +216,7 @@ public: /// RepositoryId. 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)); /// Add the IOP::ServiceContext to the reply (outgoing) @@ -224,7 +224,7 @@ public: virtual void add_reply_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); public: @@ -262,7 +262,7 @@ protected: IOP::ServiceContext *get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp index 971f0e6cf42..46779d234b7 100644 --- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp @@ -36,16 +36,16 @@ TAO_Strategized_Object_Proxy_Broker::~TAO_Strategized_Object_Proxy_Broker (void) TAO_Object_Proxy_Impl & TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr 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]; @@ -53,7 +53,7 @@ TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object void TAO_Strategized_Object_Proxy_Broker::create_proxy (int strategy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h index 94e90a7dc65..bcd2e1133cc 100644 --- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h @@ -44,12 +44,12 @@ public: ~TAO_Strategized_Object_Proxy_Broker (void); virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: void create_proxy (int collocation_strategy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp index c7de619af4e..8a0aec21337 100644 --- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp +++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp @@ -23,7 +23,7 @@ TAO_ThruPOA_Object_Proxy_Impl::~TAO_ThruPOA_Object_Proxy_Impl (void) CORBA::Boolean TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Object_Adapter::Servant_Upcall servant_upcall (target->_stubobj ()->servant_orb_var ()->orb_core ()); @@ -33,9 +33,9 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, target->_object_key (), "_is_a", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER); + return servant_upcall.servant ()->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER); } @@ -43,7 +43,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, CORBA::Boolean TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean _tao_retval = 0; @@ -59,10 +59,10 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target target->_object_key (), "_non_existent", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return servant_upcall.servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { @@ -79,7 +79,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target CORBA_InterfaceDef_ptr TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -93,10 +93,10 @@ TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target target->_object_key (), "_get_interface", forward_to.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return servant_upcall.servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + return servant_upcall.servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h index fdb1cf2225d..4bfa5073345 100644 --- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h +++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h @@ -49,16 +49,16 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target, const CORBA::Char *logical_type_id - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); #if (TAO_HAS_MINIMUM_CORBA == 0) virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA_InterfaceDef_ptr _get_interface ( const CORBA::Object_ptr target - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ); #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h index bbe4bbbdfe6..c121d52b57b 100644 --- a/TAO/tao/PortableServer/poa_macros.h +++ b/TAO/tao/PortableServer/poa_macros.h @@ -25,12 +25,12 @@ ACE_CHECK_RETURN (RETURN) #define TAO_POA_GUARD \ - TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER); \ + TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \ ACE_UNUSED_ARG (poa_guard); \ ACE_CHECK #define TAO_POA_GUARD_RETURN(RETURN) \ - TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER); \ + TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \ ACE_UNUSED_ARG (poa_guard); \ ACE_CHECK_RETURN (RETURN) |