diff options
Diffstat (limited to 'TAO/tao/Domain/DomainS.cpp')
| -rw-r--r-- | TAO/tao/Domain/DomainS.cpp | 270 |
1 files changed, 128 insertions, 142 deletions
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index 35d8ddc685f..3464929b539 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -161,36 +161,32 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_DomainManager *tao_impl , - const CORBA::PolicyType & policy_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::PolicyType & policy_type + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + virtual Dynamic::ParameterList * arguments ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( - const char * id, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + const char * id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Policy_ptr result); @@ -209,8 +205,8 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_DomainManager *tao_impl, - const CORBA::PolicyType & policy_type, - CORBA::Environment & + const CORBA::PolicyType & policy_type + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -218,12 +214,12 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_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 (ACE_TRY_ENV); + TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -239,25 +235,25 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (CORBA::E } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (TAO_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 (ACE_TRY_ENV); + TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (TAO_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, ACE_TRY_ENV); + TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Any_var safe_result_any = result_any; @@ -269,7 +265,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Envi char * TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -278,11 +274,11 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived CORBA::Boolean TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_is_a ( - const char * id, - CORBA::Environment &ACE_TRY_ENV) + const char * id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id, ACE_TRY_ENV); + return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); } void @@ -321,18 +317,18 @@ _TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Pro _TAO_CORBA_DomainManager_Proxy_Impl& _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( - ::CORBA::DomainManager *object, - CORBA::Environment &ACE_TRY_ENV + ::CORBA::DomainManager *object + TAO_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + TAO_ORB_Core::collocation_strategy (object TAO_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, ACE_TRY_ENV); + this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -341,8 +337,8 @@ _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( void _TAO_DomainManager_Strategized_Proxy_Broker::create_proxy ( - int strategy, - CORBA::Environment &ACE_TRY_ENV + int strategy + TAO_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -412,8 +408,8 @@ _TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Proxy_Impl (vo CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( CORBA::Object_ptr _collocated_tao_target_, - CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV + CORBA::PolicyType policy_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -428,8 +424,8 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "get_domain_policy", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -438,8 +434,8 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( "IDL:omg.org/CORBA/DomainManager:1.0" ) )->get_domain_policy ( - policy_type, - ACE_TRY_ENV + policy_type + TAO_ENV_ARG_PARAMETER ); } @@ -466,8 +462,8 @@ POA_CORBA_DomainManager::~POA_CORBA_DomainManager (void) void POA_CORBA_DomainManager::get_domain_policy_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, - void *_tao_servant_upcall, - CORBA::Environment &ACE_TRY_ENV + void *_tao_servant_upcall + TAO_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -496,20 +492,20 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( _tao_server_request, _tao_upcall, _tao_impl, - policy_type, - ACE_TRY_ENV + policy_type + TAO_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->get_domain_policy ( - policy_type, - ACE_TRY_ENV + policy_type + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -518,20 +514,20 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -552,16 +548,13 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( ACE_THROW (CORBA::MARSHAL()); ACE_UNUSED_ARG (_tao_servant_upcall); - - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_DomainManager::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, - void * /* Servant_Upcall */, - CORBA::Environment &ACE_TRY_ENV + void * /* Servant_Upcall */ + TAO_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -571,7 +564,7 @@ void POA_CORBA_DomainManager::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -583,12 +576,12 @@ void POA_CORBA_DomainManager::_is_a_skel ( void POA_CORBA_DomainManager::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, - void * /* Servant_Upcall */, - CORBA::Environment &ACE_TRY_ENV + void * /* Servant_Upcall */ + TAO_ENV_ARG_DECL ) { POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -600,8 +593,8 @@ void POA_CORBA_DomainManager::_non_existent_skel ( void POA_CORBA_DomainManager::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, - void * /* Servant_Upcall */, - CORBA::Environment &ACE_TRY_ENV + void * /* Servant_Upcall */ + TAO_ENV_ARG_DECL ) { POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference; @@ -620,7 +613,7 @@ void POA_CORBA_DomainManager::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); + _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -646,11 +639,11 @@ void POA_CORBA_DomainManager::_interface_skel ( } CORBA::Boolean POA_CORBA_DomainManager::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV + const char* value + TAO_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); + const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -672,12 +665,12 @@ void* POA_CORBA_DomainManager::_downcast ( return 0; } -void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV) +void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, - this, - ACE_TRY_ENV); + this + TAO_ENV_ARG_PARAMETER); } const char* POA_CORBA_DomainManager::_interface_repository_id (void) const @@ -686,9 +679,9 @@ const char* POA_CORBA_DomainManager::_interface_repository_id (void) const } CORBA::DomainManager* -POA_CORBA_DomainManager::_this (CORBA_Environment &ACE_TRY_ENV) +POA_CORBA_DomainManager::_this (TAO_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); @@ -826,36 +819,32 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstructionPolicy *tao_impl , CORBA::InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Boolean & constr_policy + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + virtual Dynamic::ParameterList * arguments ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( - const char * id, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + const char * id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -875,8 +864,8 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_ConstructionPolicy *tao_impl, CORBA::InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy, - CORBA::Environment & + const CORBA::Boolean & constr_policy + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -885,12 +874,12 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (TAO_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 (ACE_TRY_ENV); + TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Dynamic::ParameterList_var safe_parameter_list = parameter_list; @@ -909,25 +898,25 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (C } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (TAO_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 (ACE_TRY_ENV); + TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return exception_list; } CORBA::Any * -TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_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, ACE_TRY_ENV); + TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return result_any; @@ -935,7 +924,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (CORB char * TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -944,11 +933,11 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_ CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_is_a ( - const char * id, - CORBA::Environment &ACE_TRY_ENV) + const char * id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->_tao_impl->_is_a (id, ACE_TRY_ENV); + return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -980,18 +969,18 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strat _TAO_CORBA_ConstructionPolicy_Proxy_Impl& _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( - ::CORBA_ConstructionPolicy *object, - CORBA::Environment &ACE_TRY_ENV + ::CORBA_ConstructionPolicy *object + TAO_ENV_ARG_DECL ) { int strategy = - TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV); + TAO_ORB_Core::collocation_strategy (object TAO_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, ACE_TRY_ENV); + this->create_proxy (strategy TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); return *this->proxy_cache_[strategy]; @@ -1000,8 +989,8 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( void _TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy ( - int strategy, - CORBA::Environment &ACE_TRY_ENV + int strategy + TAO_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -1072,8 +1061,8 @@ _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::_TAO_ConstructionPolicy_ThruPOA_Prox void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( CORBA::Object_ptr _collocated_tao_target_, CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean constr_policy + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1086,8 +1075,8 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "make_domain_manager", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -1097,8 +1086,8 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( ) )->make_domain_manager ( object_type, - constr_policy, - ACE_TRY_ENV + constr_policy + TAO_ENV_ARG_PARAMETER ); return; } @@ -1127,8 +1116,8 @@ POA_CORBA_ConstructionPolicy::~POA_CORBA_ConstructionPolicy (void) void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( TAO_ServerRequest &_tao_server_request, void *_tao_object_reference, - void *_tao_servant_upcall, - CORBA::Environment &ACE_TRY_ENV + void *_tao_servant_upcall + TAO_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1160,40 +1149,40 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( _tao_upcall, _tao_impl, object_type.in (), - constr_policy, - ACE_TRY_ENV + constr_policy + TAO_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); + _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_impl->make_domain_manager ( object_type.in (), - constr_policy, - ACE_TRY_ENV + constr_policy + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); + _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.send_exception ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION @@ -1207,16 +1196,13 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( _tao_server_request.init_reply (); ACE_UNUSED_ARG (_tao_servant_upcall); - - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); } void POA_CORBA_ConstructionPolicy::_is_a_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, - void * /* Servant_Upcall */, - CORBA::Environment &ACE_TRY_ENV + void * /* Servant_Upcall */ + TAO_ENV_ARG_DECL ) { TAO_InputCDR &_tao_in = _tao_server_request.incoming (); @@ -1226,7 +1212,7 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1238,12 +1224,12 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel ( void POA_CORBA_ConstructionPolicy::_non_existent_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, - void * /* Servant_Upcall */, - CORBA::Environment &ACE_TRY_ENV + void * /* Servant_Upcall */ + TAO_ENV_ARG_DECL ) { POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); + CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1255,8 +1241,8 @@ void POA_CORBA_ConstructionPolicy::_non_existent_skel ( void POA_CORBA_ConstructionPolicy::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, - void * /* Servant_Upcall */, - CORBA::Environment &ACE_TRY_ENV + void * /* Servant_Upcall */ + TAO_ENV_ARG_DECL ) { POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference; @@ -1275,7 +1261,7 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( ACE_TRY { - _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); + _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; _tao_server_request.init_reply (); @@ -1301,11 +1287,11 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( } CORBA::Boolean POA_CORBA_ConstructionPolicy::_is_a ( - const char* value, - CORBA::Environment &ACE_TRY_ENV + const char* value + TAO_ENV_ARG_DECL ) { - const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); + const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ( @@ -1330,12 +1316,12 @@ void* POA_CORBA_ConstructionPolicy::_downcast ( return 0; } -void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV) +void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) { this->synchronous_upcall_dispatch (req, servant_upcall, - this, - ACE_TRY_ENV); + this + TAO_ENV_ARG_PARAMETER); } const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const @@ -1344,9 +1330,9 @@ const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const } CORBA_ConstructionPolicy* -POA_CORBA_ConstructionPolicy::_this (CORBA_Environment &ACE_TRY_ENV) +POA_CORBA_ConstructionPolicy::_this (TAO_ENV_SINGLE_ARG_DECL) { - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Stub_Auto_Ptr safe_stub (stub); |