diff options
Diffstat (limited to 'TAO/tao/Domain/DomainS.cpp')
| -rw-r--r-- | TAO/tao/Domain/DomainS.cpp | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index 3464929b539..9e1d83e7576 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -162,31 +162,31 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_DomainManager *tao_impl , const CORBA::PolicyType & policy_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual Dynamic::ParameterList * arguments ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Dynamic::ExceptionList * exceptions ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Any * result ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean target_is_a ( const char * id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void result (CORBA::Policy_ptr result); @@ -206,7 +206,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_DomainManager *tao_impl, const CORBA::PolicyType & policy_type - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -214,12 +214,12 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::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; @@ -235,25 +235,25 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::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_DomainManager_get_domain_policy::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::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; @@ -265,7 +265,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SIN char * TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -275,10 +275,10 @@ 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 - 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 @@ -318,17 +318,17 @@ _TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Pro _TAO_CORBA_DomainManager_Proxy_Impl& _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( ::CORBA::DomainManager *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]; @@ -338,7 +338,7 @@ _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy ( void _TAO_DomainManager_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -409,7 +409,7 @@ _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 - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -425,7 +425,7 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( _collocated_tao_target_->_object_key (), "get_domain_policy", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -435,7 +435,7 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy ( ) )->get_domain_policy ( policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); } @@ -463,7 +463,7 @@ void POA_CORBA_DomainManager::get_domain_policy_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 (); @@ -493,19 +493,19 @@ void POA_CORBA_DomainManager::get_domain_policy_skel ( _tao_upcall, _tao_impl, policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY { - _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER); + _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ _tao_retval = _tao_impl->get_domain_policy ( policy_type - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -514,7 +514,7 @@ 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 TAO_ENV_ARG_PARAMETER); + _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -522,12 +522,12 @@ void POA_CORBA_DomainManager::get_domain_policy_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 @@ -554,7 +554,7 @@ void POA_CORBA_DomainManager::_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 (); @@ -564,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 () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -577,11 +577,11 @@ void POA_CORBA_DomainManager::_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_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _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 (); @@ -594,7 +594,7 @@ void POA_CORBA_DomainManager::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference; @@ -613,7 +613,7 @@ void POA_CORBA_DomainManager::_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 (); @@ -640,10 +640,10 @@ void POA_CORBA_DomainManager::_interface_skel ( CORBA::Boolean POA_CORBA_DomainManager::_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 ( @@ -665,12 +665,12 @@ void* POA_CORBA_DomainManager::_downcast ( return 0; } -void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_DomainManager::_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_DomainManager::_interface_repository_id (void) const @@ -679,9 +679,9 @@ const char* POA_CORBA_DomainManager::_interface_repository_id (void) const } CORBA::DomainManager* -POA_CORBA_DomainManager::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_DomainManager::_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); @@ -820,31 +820,31 @@ public: , CORBA::InterfaceDef_ptr object_type, const CORBA::Boolean & constr_policy - 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)); @@ -865,7 +865,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe POA_CORBA_ConstructionPolicy *tao_impl, CORBA::InterfaceDef_ptr object_type, const CORBA::Boolean & constr_policy - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -874,12 +874,12 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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; @@ -898,25 +898,25 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (T } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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_ConstructionPolicy_make_domain_manager::result (TAO_ENV_SINGLE_ARG_DECL) +TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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; @@ -924,7 +924,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_ char * TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_derived_interface ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -934,10 +934,10 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_ CORBA::Boolean TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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 */ @@ -970,17 +970,17 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strat _TAO_CORBA_ConstructionPolicy_Proxy_Impl& _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( ::CORBA_ConstructionPolicy *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]; @@ -990,7 +990,7 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy ( void _TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy ( int strategy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); @@ -1062,7 +1062,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( CORBA::Object_ptr _collocated_tao_target_, CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1076,7 +1076,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( _collocated_tao_target_->_object_key (), "make_domain_manager", forward_to.out () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -1087,7 +1087,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager ( )->make_domain_manager ( object_type, constr_policy - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); return; } @@ -1117,7 +1117,7 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_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 (); @@ -1150,12 +1150,12 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( _tao_impl, object_type.in (), constr_policy - 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 */ @@ -1163,13 +1163,13 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel ( _tao_impl->make_domain_manager ( object_type.in (), constr_policy - 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 @@ -1177,12 +1177,12 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_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 @@ -1202,7 +1202,7 @@ void POA_CORBA_ConstructionPolicy::_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 (); @@ -1212,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 () TAO_ENV_ARG_PARAMETER); + _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -1225,11 +1225,11 @@ void POA_CORBA_ConstructionPolicy::_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_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _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 (); @@ -1242,7 +1242,7 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference; @@ -1261,7 +1261,7 @@ void POA_CORBA_ConstructionPolicy::_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 (); @@ -1288,10 +1288,10 @@ void POA_CORBA_ConstructionPolicy::_interface_skel ( CORBA::Boolean POA_CORBA_ConstructionPolicy::_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 ( @@ -1316,12 +1316,12 @@ void* POA_CORBA_ConstructionPolicy::_downcast ( return 0; } -void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL) +void POA_CORBA_ConstructionPolicy::_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_ConstructionPolicy::_interface_repository_id (void) const @@ -1330,9 +1330,9 @@ const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const } CORBA_ConstructionPolicy* -POA_CORBA_ConstructionPolicy::_this (TAO_ENV_SINGLE_ARG_DECL) +POA_CORBA_ConstructionPolicy::_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); |