diff options
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp | 2949 |
1 files changed, 1366 insertions, 1583 deletions
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp index 7e55a1c3994..571fa45f9c4 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp @@ -162,36 +162,32 @@ public: TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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::DefinitionKind result); @@ -208,45 +204,45 @@ private: TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_IRObject *tao_impl, - CORBA::Environment & + POA_CORBA_IRObject *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::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_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::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; @@ -258,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &A char * TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -267,11 +263,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a ( - const char * id, - 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 @@ -287,36 +283,32 @@ public: TAO_ServerRequestInfo_CORBA_IRObject_destroy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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)); @@ -332,45 +324,45 @@ private: TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_IRObject *tao_impl, - CORBA::Environment & + POA_CORBA_IRObject *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::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_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IRObject_destroy::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; @@ -378,7 +370,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TR char * TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -387,11 +379,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_IRObject_destroy::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 */ @@ -423,18 +415,18 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::~_TAO_CORBA_IRObject_Strategized_P _TAO_CORBA_IRObject_Proxy_Impl& _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy ( - ::CORBA_IRObject *object, - CORBA::Environment &ACE_TRY_ENV + ::CORBA_IRObject *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]; @@ -443,8 +435,8 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_IRObject_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_); @@ -513,8 +505,8 @@ _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl ( // ThruPOA Implementation of the IDL interface methods CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -529,8 +521,8 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "def_kind", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -539,13 +531,13 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( "IDL:omg.org/CORBA/IRObject:1.0" ) )->def_kind ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -558,8 +550,8 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "destroy", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -568,7 +560,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( "IDL:omg.org/CORBA/IRObject:1.0" ) )->destroy ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); return; } @@ -596,8 +588,8 @@ POA_CORBA_IRObject::~POA_CORBA_IRObject (void) void POA_CORBA_IRObject::_get_def_kind_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 ) { POA_CORBA_IRObject *_tao_impl = @@ -617,19 +609,19 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->def_kind ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -637,20 +629,20 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( CORBA::DefinitionKind _tao_retval_info = _tao_retval; ri.result (_tao_retval_info); ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -672,16 +664,13 @@ void POA_CORBA_IRObject::_get_def_kind_skel ( // In case _tao_servant_upcall is not used in this function 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_IRObject::destroy_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 ) { POA_CORBA_IRObject *_tao_impl = @@ -701,38 +690,38 @@ void POA_CORBA_IRObject::destroy_skel ( TAO_ServerRequestInfo_CORBA_IRObject_destroy ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->destroy ( - ACE_TRY_ENV + TAO_ENV_SINGLE_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 @@ -747,16 +736,13 @@ void POA_CORBA_IRObject::destroy_skel ( // In case _tao_servant_upcall is not used in this function 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_IRObject::_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 (); @@ -766,7 +752,7 @@ void POA_CORBA_IRObject::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -778,12 +764,12 @@ void POA_CORBA_IRObject::_is_a_skel ( void POA_CORBA_IRObject::_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_IRObject *_tao_impl = (POA_CORBA_IRObject *) _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 (); @@ -795,8 +781,8 @@ void POA_CORBA_IRObject::_non_existent_skel ( void POA_CORBA_IRObject::_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_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference; @@ -815,7 +801,7 @@ void POA_CORBA_IRObject::_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 (); @@ -841,11 +827,11 @@ void POA_CORBA_IRObject::_interface_skel ( } CORBA::Boolean POA_CORBA_IRObject::_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 ( @@ -867,12 +853,12 @@ void* POA_CORBA_IRObject::_downcast ( return 0; } -void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV) +void POA_CORBA_IRObject::_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); } @@ -882,9 +868,9 @@ const char* POA_CORBA_IRObject::_interface_repository_id (void) const } CORBA_IRObject* -POA_CORBA_IRObject::_this (CORBA_Environment &ACE_TRY_ENV) +POA_CORBA_IRObject::_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); @@ -1049,36 +1035,32 @@ public: TAO_ServerRequestInfo_CORBA_Contained_id_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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 (char * result); @@ -1095,45 +1077,45 @@ private: TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contained_id_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Contained *tao_impl, - CORBA::Environment & + POA_CORBA_Contained *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_id_get::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_id_get::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_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_id_get::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; @@ -1145,7 +1127,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::result (CORBA::Environment &ACE_TR char * TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1154,11 +1136,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_id_get::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 @@ -1175,36 +1157,32 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - const char * id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const char * id + 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)); @@ -1222,8 +1200,8 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, - const char * id, - CORBA::Environment & + const char * id + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1231,12 +1209,12 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_id_set::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; @@ -1252,25 +1230,25 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_id_set::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_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_id_set::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; @@ -1278,7 +1256,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::result (CORBA::Environment &ACE_TR char * TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1287,11 +1265,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_id_set::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); } class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestInfo @@ -1300,36 +1278,32 @@ public: TAO_ServerRequestInfo_CORBA_Contained_name_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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 (char * result); @@ -1346,45 +1320,45 @@ private: TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Contained_name_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Contained *tao_impl, - CORBA::Environment & + POA_CORBA_Contained *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_name_get::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_name_get::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_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_name_get::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; @@ -1396,7 +1370,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::result (CORBA::Environment &ACE_ char * TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1405,11 +1379,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_name_get::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 @@ -1426,36 +1400,32 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - const char * name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const char * name + 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)); @@ -1473,8 +1443,8 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, - const char * name, - CORBA::Environment & + const char * name + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1482,12 +1452,12 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_name_set::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; @@ -1503,25 +1473,25 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_name_set::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_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_name_set::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; @@ -1529,7 +1499,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::result (CORBA::Environment &ACE_ char * TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1538,11 +1508,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_name_set::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); } class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerRequestInfo @@ -1551,36 +1521,32 @@ public: TAO_ServerRequestInfo_CORBA_Contained_version_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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 (char * result); @@ -1597,45 +1563,45 @@ private: TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_Contained_version_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Contained *tao_impl, - CORBA::Environment & + POA_CORBA_Contained *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_version_get::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_version_get::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_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_version_get::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; @@ -1647,7 +1613,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::result (CORBA::Environment &A char * TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1656,11 +1622,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_version_get::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 @@ -1677,36 +1643,32 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl , - const char * version, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const char * version + 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)); @@ -1724,8 +1686,8 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Contained *tao_impl, - const char * version, - CORBA::Environment & + const char * version + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -1733,12 +1695,12 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_version_set::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; @@ -1754,25 +1716,25 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_version_set::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_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_version_set::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; @@ -1780,7 +1742,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::result (CORBA::Environment &A char * TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1789,11 +1751,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_version_set::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); } class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRequestInfo @@ -1802,36 +1764,32 @@ public: TAO_ServerRequestInfo_CORBA_Contained_defined_in_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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_Container_ptr result); @@ -1848,45 +1806,45 @@ private: TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORBA_Contained_defined_in_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Contained *tao_impl, - CORBA::Environment & + POA_CORBA_Contained *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::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_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::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; @@ -1898,7 +1856,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment char * TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -1907,11 +1865,11 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interf CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_is_a ( - const char * id, - 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 @@ -1927,36 +1885,32 @@ public: TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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 (char * result); @@ -1973,45 +1927,45 @@ private: TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Contained *tao_impl, - CORBA::Environment & + POA_CORBA_Contained *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::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_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::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; @@ -2023,7 +1977,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (CORBA::Environm char * TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2032,11 +1986,11 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_is_a ( - const char * id, - 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 @@ -2052,36 +2006,32 @@ public: TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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_Repository_ptr result); @@ -2098,45 +2048,45 @@ private: TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Contained *tao_impl, - CORBA::Environment & + POA_CORBA_Contained *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::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_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::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; @@ -2148,7 +2098,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA:: char * TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2157,11 +2107,11 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_is_a ( - const char * id, - 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 @@ -2177,36 +2127,32 @@ public: TAO_ServerRequestInfo_CORBA_Contained_describe ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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_Contained::Description * result); @@ -2223,45 +2169,45 @@ private: TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Contained_describe ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_Contained *tao_impl, - CORBA::Environment & + POA_CORBA_Contained *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_describe::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_describe::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_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_describe::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; @@ -2273,7 +2219,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_ char * TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2282,11 +2228,11 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_describe::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 @@ -2305,36 +2251,32 @@ public: , CORBA_Container_ptr new_container, const char * new_name, - const char * new_version, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const char * new_version + 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)); @@ -2356,8 +2298,8 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe POA_CORBA_Contained *tao_impl, CORBA_Container_ptr new_container, const char * new_name, - const char * new_version, - CORBA::Environment & + const char * new_version + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -2367,12 +2309,12 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_move::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; @@ -2394,25 +2336,25 @@ TAO_ServerRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_T } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_move::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_Contained_move::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Contained_move::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; @@ -2420,7 +2362,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_ char * TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -2429,11 +2371,11 @@ TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Contained_move::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 */ @@ -2465,18 +2407,18 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::~_TAO_CORBA_Contained_Strategized _TAO_CORBA_Contained_Proxy_Impl& _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy ( - ::CORBA_Contained *object, - CORBA::Environment &ACE_TRY_ENV + ::CORBA_Contained *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]; @@ -2485,8 +2427,8 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_Contained_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_); @@ -2555,8 +2497,8 @@ _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl // ThruPOA Implementation of the IDL interface methods char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2571,8 +2513,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "id", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2581,14 +2523,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( "IDL:omg.org/CORBA/Contained:1.0" ) )->id ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( CORBA_Object *_collocated_tao_target_, - const char * id, - CORBA::Environment &ACE_TRY_ENV + const char * id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2601,8 +2543,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "id", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2611,15 +2553,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( "IDL:omg.org/CORBA/Contained:1.0" ) )->id ( - id, - ACE_TRY_ENV + id + TAO_ENV_ARG_PARAMETER ); return; } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2634,8 +2576,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "name", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2644,14 +2586,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( "IDL:omg.org/CORBA/Contained:1.0" ) )->name ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( CORBA_Object *_collocated_tao_target_, - const char * name, - CORBA::Environment &ACE_TRY_ENV + const char * name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2664,8 +2606,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "name", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2674,15 +2616,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( "IDL:omg.org/CORBA/Contained:1.0" ) )->name ( - name, - ACE_TRY_ENV + name + TAO_ENV_ARG_PARAMETER ); return; } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2697,8 +2639,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "version", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2707,14 +2649,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( "IDL:omg.org/CORBA/Contained:1.0" ) )->version ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( CORBA_Object *_collocated_tao_target_, - const char * version, - CORBA::Environment &ACE_TRY_ENV + const char * version + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2727,8 +2669,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "version", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2737,15 +2679,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( "IDL:omg.org/CORBA/Contained:1.0" ) )->version ( - version, - ACE_TRY_ENV + version + TAO_ENV_ARG_PARAMETER ); return; } CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2760,8 +2702,8 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "defined_in", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2770,13 +2712,13 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( "IDL:omg.org/CORBA/Contained:1.0" ) )->defined_in ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2791,8 +2733,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "absolute_name", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2801,13 +2743,13 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( "IDL:omg.org/CORBA/Contained:1.0" ) )->absolute_name ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_repository ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2822,8 +2764,8 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "containing_repository", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2832,13 +2774,13 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit "IDL:omg.org/CORBA/Contained:1.0" ) )->containing_repository ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2853,8 +2795,8 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "describe", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -2863,7 +2805,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe "IDL:omg.org/CORBA/Contained:1.0" ) )->describe ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } @@ -2871,8 +2813,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( CORBA_Object *_collocated_tao_target_, CORBA_Container_ptr new_container, const char * new_name, - const char * new_version, - CORBA::Environment &ACE_TRY_ENV + const char * new_version + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2885,8 +2827,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "move", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; ACE_reinterpret_cast ( @@ -2897,8 +2839,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( )->move ( new_container, new_name, - new_version, - ACE_TRY_ENV + new_version + TAO_ENV_ARG_PARAMETER ); return; } @@ -2927,8 +2869,8 @@ POA_CORBA_Contained::~POA_CORBA_Contained (void) void POA_CORBA_Contained::_get_id_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 ) { POA_CORBA_Contained *_tao_impl = @@ -2948,19 +2890,19 @@ void POA_CORBA_Contained::_get_id_skel ( TAO_ServerRequestInfo_CORBA_Contained_id_get ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->id ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2969,20 +2911,20 @@ void POA_CORBA_Contained::_get_id_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -3004,16 +2946,13 @@ void POA_CORBA_Contained::_get_id_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_set_id_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 (); @@ -3041,39 +2980,39 @@ void POA_CORBA_Contained::_set_id_skel ( _tao_server_request, _tao_upcall, _tao_impl, - id.in (), - ACE_TRY_ENV + id.in () + 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->id ( - id.in (), - ACE_TRY_ENV + id.in () + 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 @@ -3088,16 +3027,13 @@ void POA_CORBA_Contained::_set_id_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_get_name_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 ) { POA_CORBA_Contained *_tao_impl = @@ -3117,19 +3053,19 @@ void POA_CORBA_Contained::_get_name_skel ( TAO_ServerRequestInfo_CORBA_Contained_name_get ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->name ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3138,20 +3074,20 @@ void POA_CORBA_Contained::_get_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -3173,16 +3109,13 @@ void POA_CORBA_Contained::_get_name_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_set_name_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 (); @@ -3210,39 +3143,39 @@ void POA_CORBA_Contained::_set_name_skel ( _tao_server_request, _tao_upcall, _tao_impl, - name.in (), - ACE_TRY_ENV + name.in () + 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->name ( - name.in (), - ACE_TRY_ENV + name.in () + 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 @@ -3257,16 +3190,13 @@ void POA_CORBA_Contained::_set_name_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_get_version_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 ) { POA_CORBA_Contained *_tao_impl = @@ -3286,19 +3216,19 @@ void POA_CORBA_Contained::_get_version_skel ( TAO_ServerRequestInfo_CORBA_Contained_version_get ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->version ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3307,20 +3237,20 @@ void POA_CORBA_Contained::_get_version_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -3342,16 +3272,13 @@ void POA_CORBA_Contained::_get_version_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_set_version_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 (); @@ -3379,39 +3306,39 @@ void POA_CORBA_Contained::_set_version_skel ( _tao_server_request, _tao_upcall, _tao_impl, - version.in (), - ACE_TRY_ENV + version.in () + 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->version ( - version.in (), - ACE_TRY_ENV + version.in () + 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 @@ -3426,16 +3353,13 @@ void POA_CORBA_Contained::_set_version_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_get_defined_in_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 ) { POA_CORBA_Contained *_tao_impl = @@ -3455,19 +3379,19 @@ void POA_CORBA_Contained::_get_defined_in_skel ( TAO_ServerRequestInfo_CORBA_Contained_defined_in_get ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->defined_in ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3476,20 +3400,20 @@ void POA_CORBA_Contained::_get_defined_in_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -3511,16 +3435,13 @@ void POA_CORBA_Contained::_get_defined_in_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_get_absolute_name_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 ) { POA_CORBA_Contained *_tao_impl = @@ -3540,19 +3461,19 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->absolute_name ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3561,20 +3482,20 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -3596,16 +3517,13 @@ void POA_CORBA_Contained::_get_absolute_name_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_get_containing_repository_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 ) { POA_CORBA_Contained *_tao_impl = @@ -3625,19 +3543,19 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->containing_repository ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3646,20 +3564,20 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -3681,16 +3599,13 @@ void POA_CORBA_Contained::_get_containing_repository_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::describe_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 ) { POA_CORBA_Contained *_tao_impl = @@ -3710,19 +3625,19 @@ void POA_CORBA_Contained::describe_skel ( TAO_ServerRequestInfo_CORBA_Contained_describe ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->describe ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3731,20 +3646,20 @@ void POA_CORBA_Contained::describe_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -3766,16 +3681,13 @@ void POA_CORBA_Contained::describe_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::move_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 (); @@ -3809,13 +3721,13 @@ void POA_CORBA_Contained::move_skel ( _tao_impl, new_container.in (), new_name.in (), - new_version.in (), - ACE_TRY_ENV + new_version.in () + 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 */ @@ -3823,27 +3735,27 @@ void POA_CORBA_Contained::move_skel ( _tao_impl->move ( new_container.in (), new_name.in (), - new_version.in (), - ACE_TRY_ENV + new_version.in () + 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 @@ -3858,16 +3770,13 @@ void POA_CORBA_Contained::move_skel ( // In case _tao_servant_upcall is not used in this function 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_Contained::_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 (); @@ -3877,7 +3786,7 @@ void POA_CORBA_Contained::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -3889,12 +3798,12 @@ void POA_CORBA_Contained::_is_a_skel ( void POA_CORBA_Contained::_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_Contained *_tao_impl = (POA_CORBA_Contained *) _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 (); @@ -3906,8 +3815,8 @@ void POA_CORBA_Contained::_non_existent_skel ( void POA_CORBA_Contained::_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_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference; @@ -3926,7 +3835,7 @@ void POA_CORBA_Contained::_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 (); @@ -3952,11 +3861,11 @@ void POA_CORBA_Contained::_interface_skel ( } CORBA::Boolean POA_CORBA_Contained::_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 ( @@ -3981,12 +3890,12 @@ void* POA_CORBA_Contained::_downcast ( return 0; } -void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV) +void POA_CORBA_Contained::_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); } @@ -3996,9 +3905,9 @@ const char* POA_CORBA_Contained::_interface_repository_id (void) const } CORBA_Contained* -POA_CORBA_Contained::_this (CORBA_Environment &ACE_TRY_ENV) +POA_CORBA_Contained::_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); @@ -4170,36 +4079,32 @@ public: TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl , - const char * search_name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const char * search_name + 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_Contained_ptr result); @@ -4218,8 +4123,8 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Container *tao_impl, - const char * search_name, - CORBA::Environment & + const char * search_name + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4227,12 +4132,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_lookup::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; @@ -4248,25 +4153,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_lookup::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_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_lookup::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; @@ -4278,7 +4183,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TR char * TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4287,11 +4192,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_lookup::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 @@ -4309,36 +4214,32 @@ public: TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl , CORBA::DefinitionKind & limit_type, - const CORBA::Boolean & exclude_inherited, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Boolean & exclude_inherited + 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_ContainedSeq * result); @@ -4359,8 +4260,8 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, POA_CORBA_Container *tao_impl, CORBA::DefinitionKind & limit_type, - const CORBA::Boolean & exclude_inherited, - CORBA::Environment & + const CORBA::Boolean & exclude_inherited + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4369,12 +4270,12 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_contents::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; @@ -4393,25 +4294,25 @@ TAO_ServerRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &A } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_contents::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_Container_contents::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_contents::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; @@ -4423,7 +4324,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_ char * TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4432,11 +4333,11 @@ TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_contents::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 @@ -4456,36 +4357,32 @@ public: const char * search_name, const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, - const CORBA::Boolean & exclude_inherited, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Boolean & exclude_inherited + 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_ContainedSeq * result); @@ -4510,8 +4407,8 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C const char * search_name, const CORBA::Long & levels_to_search, CORBA::DefinitionKind & limit_type, - const CORBA::Boolean & exclude_inherited, - CORBA::Environment & + const CORBA::Boolean & exclude_inherited + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4522,12 +4419,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::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; @@ -4552,25 +4449,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::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_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_lookup_name::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; @@ -4582,7 +4479,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &A char * TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4591,11 +4488,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_lookup_name::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 @@ -4614,36 +4511,32 @@ public: , CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, - const CORBA::Long & max_returned_objs, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Long & max_returned_objs + 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_Container::DescriptionSeq * result); @@ -4666,8 +4559,8 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C POA_CORBA_Container *tao_impl, CORBA::DefinitionKind & limit_type, const CORBA::Boolean & exclude_inherited, - const CORBA::Long & max_returned_objs, - CORBA::Environment & + const CORBA::Long & max_returned_objs + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4677,12 +4570,12 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::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; @@ -4704,25 +4597,25 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Envir } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::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_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_describe_contents::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; @@ -4734,7 +4627,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environm char * TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4743,11 +4636,11 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_int CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_describe_contents::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 @@ -4766,36 +4659,32 @@ public: , const char * id, const char * name, - const char * version, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const char * version + 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_ModuleDef_ptr result); @@ -4818,8 +4707,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA POA_CORBA_Container *tao_impl, const char * id, const char * name, - const char * version, - CORBA::Environment & + const char * version + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4829,12 +4718,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_module::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; @@ -4856,25 +4745,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environme } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_module::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_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_module::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; @@ -4886,7 +4775,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA::Environment char * TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -4895,11 +4784,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_module::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 @@ -4920,36 +4809,32 @@ public: const char * name, const char * version, CORBA_IDLType_ptr type, - const CORBA::Any & value, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Any & value + 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_ConstantDef_ptr result); @@ -4976,8 +4861,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR const char * name, const char * version, CORBA_IDLType_ptr type, - const CORBA::Any & value, - CORBA::Environment & + const CORBA::Any & value + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -4989,12 +4874,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_constant::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; @@ -5022,25 +4907,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environ } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_constant::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_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_constant::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; @@ -5052,7 +4937,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA::Environmen char * TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5061,11 +4946,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_inter CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_constant::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 @@ -5085,36 +4970,32 @@ public: const char * id, const char * name, const char * version, - const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_StructMemberSeq & members + 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_StructDef_ptr result); @@ -5139,8 +5020,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA const char * id, const char * name, const char * version, - const CORBA_StructMemberSeq & members, - CORBA::Environment & + const CORBA_StructMemberSeq & members + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5151,12 +5032,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_struct::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; @@ -5181,25 +5062,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environme } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_struct::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_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_struct::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; @@ -5211,7 +5092,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment char * TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5220,11 +5101,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_struct::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 @@ -5245,36 +5126,32 @@ public: const char * name, const char * version, CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_UnionMemberSeq & members + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + 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_UnionDef_ptr result); @@ -5301,8 +5178,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_ const char * name, const char * version, CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq & members, - CORBA::Environment & + const CORBA_UnionMemberSeq & members + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5314,12 +5191,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_union::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; @@ -5347,25 +5224,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environmen } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_union::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_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_union::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; @@ -5377,7 +5254,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA::Environment & char * TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5386,11 +5263,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_union::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 @@ -5410,36 +5287,32 @@ public: const char * id, const char * name, const char * version, - const CORBA_EnumMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_EnumMemberSeq & members + 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_EnumDef_ptr result); @@ -5464,8 +5337,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C const char * id, const char * name, const char * version, - const CORBA_EnumMemberSeq & members, - CORBA::Environment & + const CORBA_EnumMemberSeq & members + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5476,12 +5349,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_enum::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; @@ -5506,25 +5379,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_enum::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_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_enum::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; @@ -5536,7 +5409,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &A char * TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5545,11 +5418,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_enum::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 @@ -5569,36 +5442,32 @@ public: const char * id, const char * name, const char * version, - CORBA_IDLType_ptr original_type, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA_IDLType_ptr original_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_AliasDef_ptr result); @@ -5623,8 +5492,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_ const char * id, const char * name, const char * version, - CORBA_IDLType_ptr original_type, - CORBA::Environment & + CORBA_IDLType_ptr original_type + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5635,12 +5504,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_alias::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; @@ -5665,25 +5534,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environmen } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_alias::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_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_alias::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; @@ -5695,7 +5564,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment & char * TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5704,11 +5573,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_alias::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 @@ -5728,36 +5597,32 @@ public: const char * id, const char * name, const char * version, - const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_InterfaceDefSeq & base_interfaces + 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_InterfaceDef_ptr result); @@ -5782,8 +5647,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO const char * id, const char * name, const char * version, - const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment & + const CORBA_InterfaceDefSeq & base_interfaces + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5794,12 +5659,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_interface::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; @@ -5824,25 +5689,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Enviro } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_interface::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_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_interface::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; @@ -5854,7 +5719,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA::Environme char * TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -5863,11 +5728,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_interface::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 @@ -5893,36 +5758,32 @@ public: const CORBA::Boolean & is_truncatable, const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, - const CORBA_InitializerSeq & initializers, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_InitializerSeq & initializers + 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_ValueDef_ptr result); @@ -5959,8 +5820,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_ const CORBA::Boolean & is_truncatable, const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, - const CORBA_InitializerSeq & initializers, - CORBA::Environment & + const CORBA_InitializerSeq & initializers + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -5977,12 +5838,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_ {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_value::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; @@ -6025,25 +5886,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environmen } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_value::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_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_value::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; @@ -6055,7 +5916,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA::Environment & char * TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6064,11 +5925,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interfac CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_value::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 @@ -6088,36 +5949,32 @@ public: const char * id, const char * name, const char * version, - CORBA_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA_IDLType_ptr original_type_def + 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_ValueBoxDef_ptr result); @@ -6142,8 +5999,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO const char * id, const char * name, const char * version, - CORBA_IDLType_ptr original_type_def, - CORBA::Environment & + CORBA_IDLType_ptr original_type_def + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6154,12 +6011,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::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; @@ -6184,25 +6041,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Enviro } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::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_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_value_box::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; @@ -6214,7 +6071,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environme char * TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6223,11 +6080,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_is_a ( - const char * id, - 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 @@ -6247,36 +6104,32 @@ public: const char * id, const char * name, const char * version, - const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_StructMemberSeq & members + 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_ExceptionDef_ptr result); @@ -6301,8 +6154,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO const char * id, const char * name, const char * version, - const CORBA_StructMemberSeq & members, - CORBA::Environment & + const CORBA_StructMemberSeq & members + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6313,12 +6166,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_exception::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; @@ -6343,25 +6196,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Enviro } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_exception::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_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_exception::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; @@ -6373,7 +6226,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA::Environme char * TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6382,11 +6235,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_inte CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_exception::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 @@ -6405,36 +6258,32 @@ public: , const char * id, const char * name, - const char * version, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const char * version + 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_NativeDef_ptr result); @@ -6457,8 +6306,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA POA_CORBA_Container *tao_impl, const char * id, const char * name, - const char * version, - CORBA::Environment & + const char * version + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6468,12 +6317,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_native::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; @@ -6495,25 +6344,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environme } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_native::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_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_native::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; @@ -6525,7 +6374,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA::Environment char * TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6534,11 +6383,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interfa CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_native::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 @@ -6558,36 +6407,32 @@ public: const char * id, const char * name, const char * version, - const CORBA_AbstractInterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_AbstractInterfaceDefSeq & base_interfaces + 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_AbstractInterfaceDef_ptr result); @@ -6612,8 +6457,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque const char * id, const char * name, const char * version, - const CORBA_AbstractInterfaceDefSeq & base_interfaces, - CORBA::Environment & + const CORBA_AbstractInterfaceDefSeq & base_interfaces + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6624,12 +6469,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::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; @@ -6654,25 +6499,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORB } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::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_Container_create_abstract_interface::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::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; @@ -6684,7 +6529,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA:: char * TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6693,11 +6538,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_der CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_is_a ( - const char * id, - 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 @@ -6717,36 +6562,32 @@ public: const char * id, const char * name, const char * version, - const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_InterfaceDefSeq & base_interfaces + 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_LocalInterfaceDef_ptr result); @@ -6771,8 +6612,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI const char * id, const char * name, const char * version, - const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment & + const CORBA_InterfaceDefSeq & base_interfaces + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl), @@ -6783,12 +6624,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::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; @@ -6813,25 +6654,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA:: } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::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_Container_create_local_interface::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_Container_create_local_interface::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; @@ -6843,7 +6684,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Env char * TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -6852,11 +6693,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derive CORBA::Boolean TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_is_a ( - const char * id, - 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 @@ -6895,18 +6736,18 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::~_TAO_CORBA_Container_Strategized _TAO_CORBA_Container_Proxy_Impl& _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy ( - ::CORBA_Container *object, - CORBA::Environment &ACE_TRY_ENV + ::CORBA_Container *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]; @@ -6915,8 +6756,8 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_Container_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_); @@ -6986,8 +6827,8 @@ _TAO_CORBA_Container_ThruPOA_Proxy_Impl::_TAO_CORBA_Container_ThruPOA_Proxy_Impl CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( CORBA_Object *_collocated_tao_target_, - const char * search_name, - CORBA::Environment &ACE_TRY_ENV + const char * search_name + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7002,8 +6843,8 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "lookup", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7012,16 +6853,16 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( "IDL:omg.org/CORBA/Container:1.0" ) )->lookup ( - search_name, - ACE_TRY_ENV + search_name + TAO_ENV_ARG_PARAMETER ); } CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, - CORBA::Boolean exclude_inherited, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean exclude_inherited + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7036,8 +6877,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "contents", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7047,8 +6888,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( ) )->contents ( limit_type, - exclude_inherited, - ACE_TRY_ENV + exclude_inherited + TAO_ENV_ARG_PARAMETER ); } @@ -7057,8 +6898,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( const char * search_name, CORBA::Long levels_to_search, CORBA::DefinitionKind limit_type, - CORBA::Boolean exclude_inherited, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean exclude_inherited + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7073,8 +6914,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "lookup_name", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7086,8 +6927,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( search_name, levels_to_search, limit_type, - exclude_inherited, - ACE_TRY_ENV + exclude_inherited + TAO_ENV_ARG_PARAMETER ); } @@ -7095,8 +6936,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr CORBA_Object *_collocated_tao_target_, CORBA::DefinitionKind limit_type, CORBA::Boolean exclude_inherited, - CORBA::Long max_returned_objs, - CORBA::Environment &ACE_TRY_ENV + CORBA::Long max_returned_objs + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7111,8 +6952,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "describe_contents", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7123,8 +6964,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr )->describe_contents ( limit_type, exclude_inherited, - max_returned_objs, - ACE_TRY_ENV + max_returned_objs + TAO_ENV_ARG_PARAMETER ); } @@ -7132,8 +6973,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( CORBA_Object *_collocated_tao_target_, const char * id, const char * name, - const char * version, - CORBA::Environment &ACE_TRY_ENV + const char * version + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7148,8 +6989,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_module", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7160,8 +7001,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( )->create_module ( id, name, - version, - ACE_TRY_ENV + version + TAO_ENV_ARG_PARAMETER ); } @@ -7171,8 +7012,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( const char * name, const char * version, CORBA_IDLType_ptr type, - const CORBA::Any & value, - CORBA::Environment &ACE_TRY_ENV + const CORBA::Any & value + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7187,8 +7028,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_constant", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7201,8 +7042,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( name, version, type, - value, - ACE_TRY_ENV + value + TAO_ENV_ARG_PARAMETER ); } @@ -7211,8 +7052,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( const char * id, const char * name, const char * version, - const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_StructMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7227,8 +7068,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_struct", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7240,8 +7081,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( id, name, version, - members, - ACE_TRY_ENV + members + TAO_ENV_ARG_PARAMETER ); } @@ -7251,8 +7092,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( const char * name, const char * version, CORBA_IDLType_ptr discriminator_type, - const CORBA_UnionMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_UnionMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7267,8 +7108,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_union", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7281,8 +7122,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( name, version, discriminator_type, - members, - ACE_TRY_ENV + members + TAO_ENV_ARG_PARAMETER ); } @@ -7291,8 +7132,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( const char * id, const char * name, const char * version, - const CORBA_EnumMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_EnumMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7307,8 +7148,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_enum", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7320,8 +7161,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( id, name, version, - members, - ACE_TRY_ENV + members + TAO_ENV_ARG_PARAMETER ); } @@ -7330,8 +7171,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( const char * id, const char * name, const char * version, - CORBA_IDLType_ptr original_type, - CORBA::Environment &ACE_TRY_ENV + CORBA_IDLType_ptr original_type + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7346,8 +7187,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_alias", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7359,8 +7200,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( id, name, version, - original_type, - ACE_TRY_ENV + original_type + TAO_ENV_ARG_PARAMETER ); } @@ -7369,8 +7210,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface const char * id, const char * name, const char * version, - const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InterfaceDefSeq & base_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7385,8 +7226,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_interface", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7398,8 +7239,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface id, name, version, - base_interfaces, - ACE_TRY_ENV + base_interfaces + TAO_ENV_ARG_PARAMETER ); } @@ -7414,8 +7255,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( CORBA::Boolean is_truncatable, const CORBA_ValueDefSeq & abstract_base_values, const CORBA_InterfaceDefSeq & supported_interfaces, - const CORBA_InitializerSeq & initializers, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InitializerSeq & initializers + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7430,8 +7271,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_value", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7449,8 +7290,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( is_truncatable, abstract_base_values, supported_interfaces, - initializers, - ACE_TRY_ENV + initializers + TAO_ENV_ARG_PARAMETER ); } @@ -7459,8 +7300,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box const char * id, const char * name, const char * version, - CORBA_IDLType_ptr original_type_def, - CORBA::Environment &ACE_TRY_ENV + CORBA_IDLType_ptr original_type_def + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7475,8 +7316,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_value_box", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7488,8 +7329,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box id, name, version, - original_type_def, - ACE_TRY_ENV + original_type_def + TAO_ENV_ARG_PARAMETER ); } @@ -7498,8 +7339,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception const char * id, const char * name, const char * version, - const CORBA_StructMemberSeq & members, - CORBA::Environment &ACE_TRY_ENV + const CORBA_StructMemberSeq & members + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7514,8 +7355,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_exception", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7527,8 +7368,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception id, name, version, - members, - ACE_TRY_ENV + members + TAO_ENV_ARG_PARAMETER ); } @@ -7536,8 +7377,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( CORBA_Object *_collocated_tao_target_, const char * id, const char * name, - const char * version, - CORBA::Environment &ACE_TRY_ENV + const char * version + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7552,8 +7393,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_native", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7564,8 +7405,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( )->create_native ( id, name, - version, - ACE_TRY_ENV + version + TAO_ENV_ARG_PARAMETER ); } @@ -7574,8 +7415,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a const char * id, const char * name, const char * version, - const CORBA_AbstractInterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_AbstractInterfaceDefSeq & base_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7590,8 +7431,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_abstract_interface", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7603,8 +7444,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a id, name, version, - base_interfaces, - ACE_TRY_ENV + base_interfaces + TAO_ENV_ARG_PARAMETER ); } @@ -7613,8 +7454,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca const char * id, const char * name, const char * version, - const CORBA_InterfaceDefSeq & base_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InterfaceDefSeq & base_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7629,8 +7470,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "create_local_interface", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -7642,8 +7483,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca id, name, version, - base_interfaces, - ACE_TRY_ENV + base_interfaces + TAO_ENV_ARG_PARAMETER ); } @@ -7671,8 +7512,8 @@ POA_CORBA_Container::~POA_CORBA_Container (void) void POA_CORBA_Container::lookup_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 (); @@ -7700,20 +7541,20 @@ void POA_CORBA_Container::lookup_skel ( _tao_server_request, _tao_upcall, _tao_impl, - search_name.in (), - ACE_TRY_ENV + search_name.in () + 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->lookup ( - search_name.in (), - ACE_TRY_ENV + search_name.in () + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7722,20 +7563,20 @@ void POA_CORBA_Container::lookup_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -7757,16 +7598,13 @@ void POA_CORBA_Container::lookup_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::contents_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 (); @@ -7797,21 +7635,21 @@ void POA_CORBA_Container::contents_skel ( _tao_upcall, _tao_impl, limit_type, - exclude_inherited, - ACE_TRY_ENV + exclude_inherited + 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->contents ( limit_type, - exclude_inherited, - ACE_TRY_ENV + exclude_inherited + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7820,20 +7658,20 @@ void POA_CORBA_Container::contents_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -7855,16 +7693,13 @@ void POA_CORBA_Container::contents_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::lookup_name_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 (); @@ -7901,13 +7736,13 @@ void POA_CORBA_Container::lookup_name_skel ( search_name.in (), levels_to_search, limit_type, - exclude_inherited, - ACE_TRY_ENV + exclude_inherited + 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 */ @@ -7916,8 +7751,8 @@ void POA_CORBA_Container::lookup_name_skel ( search_name.in (), levels_to_search, limit_type, - exclude_inherited, - ACE_TRY_ENV + exclude_inherited + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7926,20 +7761,20 @@ void POA_CORBA_Container::lookup_name_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -7961,16 +7796,13 @@ void POA_CORBA_Container::lookup_name_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::describe_contents_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 (); @@ -8004,13 +7836,13 @@ void POA_CORBA_Container::describe_contents_skel ( _tao_impl, limit_type, exclude_inherited, - max_returned_objs, - ACE_TRY_ENV + max_returned_objs + 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 */ @@ -8018,8 +7850,8 @@ void POA_CORBA_Container::describe_contents_skel ( _tao_impl->describe_contents ( limit_type, exclude_inherited, - max_returned_objs, - ACE_TRY_ENV + max_returned_objs + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8028,20 +7860,20 @@ void POA_CORBA_Container::describe_contents_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8063,16 +7895,13 @@ void POA_CORBA_Container::describe_contents_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_module_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 (); @@ -8106,13 +7935,13 @@ void POA_CORBA_Container::create_module_skel ( _tao_impl, id.in (), name.in (), - version.in (), - ACE_TRY_ENV + version.in () + 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 */ @@ -8120,8 +7949,8 @@ void POA_CORBA_Container::create_module_skel ( _tao_impl->create_module ( id.in (), name.in (), - version.in (), - ACE_TRY_ENV + version.in () + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8130,20 +7959,20 @@ void POA_CORBA_Container::create_module_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8165,16 +7994,13 @@ void POA_CORBA_Container::create_module_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_constant_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 (); @@ -8214,13 +8040,13 @@ void POA_CORBA_Container::create_constant_skel ( name.in (), version.in (), type.in (), - value, - ACE_TRY_ENV + value + 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 */ @@ -8230,8 +8056,8 @@ void POA_CORBA_Container::create_constant_skel ( name.in (), version.in (), type.in (), - value, - ACE_TRY_ENV + value + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8240,20 +8066,20 @@ void POA_CORBA_Container::create_constant_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8275,16 +8101,13 @@ void POA_CORBA_Container::create_constant_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_struct_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 (); @@ -8321,13 +8144,13 @@ void POA_CORBA_Container::create_struct_skel ( id.in (), name.in (), version.in (), - members, - ACE_TRY_ENV + members + 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 */ @@ -8336,8 +8159,8 @@ void POA_CORBA_Container::create_struct_skel ( id.in (), name.in (), version.in (), - members, - ACE_TRY_ENV + members + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8346,20 +8169,20 @@ void POA_CORBA_Container::create_struct_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8381,16 +8204,13 @@ void POA_CORBA_Container::create_struct_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_union_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 (); @@ -8430,13 +8250,13 @@ void POA_CORBA_Container::create_union_skel ( name.in (), version.in (), discriminator_type.in (), - members, - ACE_TRY_ENV + members + 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 */ @@ -8446,8 +8266,8 @@ void POA_CORBA_Container::create_union_skel ( name.in (), version.in (), discriminator_type.in (), - members, - ACE_TRY_ENV + members + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8456,20 +8276,20 @@ void POA_CORBA_Container::create_union_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8491,16 +8311,13 @@ void POA_CORBA_Container::create_union_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_enum_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 (); @@ -8537,13 +8354,13 @@ void POA_CORBA_Container::create_enum_skel ( id.in (), name.in (), version.in (), - members, - ACE_TRY_ENV + members + 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 */ @@ -8552,8 +8369,8 @@ void POA_CORBA_Container::create_enum_skel ( id.in (), name.in (), version.in (), - members, - ACE_TRY_ENV + members + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8562,20 +8379,20 @@ void POA_CORBA_Container::create_enum_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8597,16 +8414,13 @@ void POA_CORBA_Container::create_enum_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_alias_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 (); @@ -8643,13 +8457,13 @@ void POA_CORBA_Container::create_alias_skel ( id.in (), name.in (), version.in (), - original_type.in (), - ACE_TRY_ENV + original_type.in () + 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 */ @@ -8658,8 +8472,8 @@ void POA_CORBA_Container::create_alias_skel ( id.in (), name.in (), version.in (), - original_type.in (), - ACE_TRY_ENV + original_type.in () + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8668,20 +8482,20 @@ void POA_CORBA_Container::create_alias_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8703,16 +8517,13 @@ void POA_CORBA_Container::create_alias_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_interface_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 (); @@ -8749,13 +8560,13 @@ void POA_CORBA_Container::create_interface_skel ( id.in (), name.in (), version.in (), - base_interfaces, - ACE_TRY_ENV + base_interfaces + 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 */ @@ -8764,8 +8575,8 @@ void POA_CORBA_Container::create_interface_skel ( id.in (), name.in (), version.in (), - base_interfaces, - ACE_TRY_ENV + base_interfaces + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8774,20 +8585,20 @@ void POA_CORBA_Container::create_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8809,16 +8620,13 @@ void POA_CORBA_Container::create_interface_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_value_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 (); @@ -8873,13 +8681,13 @@ void POA_CORBA_Container::create_value_skel ( is_truncatable, abstract_base_values, supported_interfaces, - initializers, - ACE_TRY_ENV + initializers + 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 */ @@ -8894,8 +8702,8 @@ void POA_CORBA_Container::create_value_skel ( is_truncatable, abstract_base_values, supported_interfaces, - initializers, - ACE_TRY_ENV + initializers + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -8904,20 +8712,20 @@ void POA_CORBA_Container::create_value_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -8939,16 +8747,13 @@ void POA_CORBA_Container::create_value_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_value_box_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 (); @@ -8985,13 +8790,13 @@ void POA_CORBA_Container::create_value_box_skel ( id.in (), name.in (), version.in (), - original_type_def.in (), - ACE_TRY_ENV + original_type_def.in () + 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 */ @@ -9000,8 +8805,8 @@ void POA_CORBA_Container::create_value_box_skel ( id.in (), name.in (), version.in (), - original_type_def.in (), - ACE_TRY_ENV + original_type_def.in () + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9010,20 +8815,20 @@ void POA_CORBA_Container::create_value_box_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -9045,16 +8850,13 @@ void POA_CORBA_Container::create_value_box_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_exception_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 (); @@ -9091,13 +8893,13 @@ void POA_CORBA_Container::create_exception_skel ( id.in (), name.in (), version.in (), - members, - ACE_TRY_ENV + members + 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 */ @@ -9106,8 +8908,8 @@ void POA_CORBA_Container::create_exception_skel ( id.in (), name.in (), version.in (), - members, - ACE_TRY_ENV + members + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9116,20 +8918,20 @@ void POA_CORBA_Container::create_exception_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -9151,16 +8953,13 @@ void POA_CORBA_Container::create_exception_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_native_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 (); @@ -9194,13 +8993,13 @@ void POA_CORBA_Container::create_native_skel ( _tao_impl, id.in (), name.in (), - version.in (), - ACE_TRY_ENV + version.in () + 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 */ @@ -9208,8 +9007,8 @@ void POA_CORBA_Container::create_native_skel ( _tao_impl->create_native ( id.in (), name.in (), - version.in (), - ACE_TRY_ENV + version.in () + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9218,20 +9017,20 @@ void POA_CORBA_Container::create_native_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -9253,16 +9052,13 @@ void POA_CORBA_Container::create_native_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_abstract_interface_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 (); @@ -9299,13 +9095,13 @@ void POA_CORBA_Container::create_abstract_interface_skel ( id.in (), name.in (), version.in (), - base_interfaces, - ACE_TRY_ENV + base_interfaces + 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 */ @@ -9314,8 +9110,8 @@ void POA_CORBA_Container::create_abstract_interface_skel ( id.in (), name.in (), version.in (), - base_interfaces, - ACE_TRY_ENV + base_interfaces + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9324,20 +9120,20 @@ void POA_CORBA_Container::create_abstract_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -9359,16 +9155,13 @@ void POA_CORBA_Container::create_abstract_interface_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::create_local_interface_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 (); @@ -9405,13 +9198,13 @@ void POA_CORBA_Container::create_local_interface_skel ( id.in (), name.in (), version.in (), - base_interfaces, - ACE_TRY_ENV + base_interfaces + 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 */ @@ -9420,8 +9213,8 @@ void POA_CORBA_Container::create_local_interface_skel ( id.in (), name.in (), version.in (), - base_interfaces, - ACE_TRY_ENV + base_interfaces + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -9430,20 +9223,20 @@ void POA_CORBA_Container::create_local_interface_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -9465,16 +9258,13 @@ void POA_CORBA_Container::create_local_interface_skel ( // In case _tao_servant_upcall is not used in this function 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_Container::_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 (); @@ -9484,7 +9274,7 @@ void POA_CORBA_Container::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -9496,12 +9286,12 @@ void POA_CORBA_Container::_is_a_skel ( void POA_CORBA_Container::_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_Container *_tao_impl = (POA_CORBA_Container *) _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 (); @@ -9513,8 +9303,8 @@ void POA_CORBA_Container::_non_existent_skel ( void POA_CORBA_Container::_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_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference; @@ -9533,7 +9323,7 @@ void POA_CORBA_Container::_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 (); @@ -9559,11 +9349,11 @@ void POA_CORBA_Container::_interface_skel ( } CORBA::Boolean POA_CORBA_Container::_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 ( @@ -9588,12 +9378,12 @@ void* POA_CORBA_Container::_downcast ( return 0; } -void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV) +void POA_CORBA_Container::_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); } @@ -9603,9 +9393,9 @@ const char* POA_CORBA_Container::_interface_repository_id (void) const } CORBA_Container* -POA_CORBA_Container::_this (CORBA_Environment &ACE_TRY_ENV) +POA_CORBA_Container::_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); @@ -9740,36 +9530,32 @@ public: TAO_ServerRequestInfo_CORBA_IDLType_type_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IDLType *tao_impl - , - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + + 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::TypeCode_ptr result); @@ -9786,45 +9572,45 @@ private: TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLType_type_get ( TAO_ServerRequest &_tao_server_request, TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, - POA_CORBA_IDLType *tao_impl, - CORBA::Environment & + POA_CORBA_IDLType *tao_impl + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall), _tao_impl (tao_impl) {} Dynamic::ParameterList * -TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::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); return parameter_list; } Dynamic::ExceptionList * -TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::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_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ServerRequestInfo_CORBA_IDLType_type_get::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; @@ -9836,7 +9622,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::Environment &ACE_TR char * TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -9845,11 +9631,11 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface ( CORBA::Boolean TAO_ServerRequestInfo_CORBA_IDLType_type_get::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 @@ -9888,18 +9674,18 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::~_TAO_CORBA_IDLType_Strategized_Pro _TAO_CORBA_IDLType_Proxy_Impl& _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy ( - ::CORBA_IDLType *object, - CORBA::Environment &ACE_TRY_ENV + ::CORBA_IDLType *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]; @@ -9908,8 +9694,8 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_IDLType_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_); @@ -9978,8 +9764,8 @@ _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (vo // ThruPOA Implementation of the IDL interface methods CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -9994,8 +9780,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( servant_upcall.prepare_for_upcall ( _collocated_tao_target_->_object_key (), "type", - forward_to.out (), - ACE_TRY_ENV + forward_to.out () + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -10004,7 +9790,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( "IDL:omg.org/CORBA/IDLType:1.0" ) )->type ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); } @@ -10032,8 +9818,8 @@ POA_CORBA_IDLType::~POA_CORBA_IDLType (void) void POA_CORBA_IDLType::_get_type_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 ) { POA_CORBA_IDLType *_tao_impl = @@ -10053,19 +9839,19 @@ void POA_CORBA_IDLType::_get_type_skel ( TAO_ServerRequestInfo_CORBA_IDLType_type_get ri ( _tao_server_request, _tao_upcall, - _tao_impl, - ACE_TRY_ENV + _tao_impl + 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->type ( - ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -10074,20 +9860,20 @@ void POA_CORBA_IDLType::_get_type_skel ( ri.result (_tao_retval_info); _tao_retval = _tao_retval_info; ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, 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 @@ -10109,16 +9895,13 @@ void POA_CORBA_IDLType::_get_type_skel ( // In case _tao_servant_upcall is not used in this function 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_IDLType::_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 (); @@ -10128,7 +9911,7 @@ void POA_CORBA_IDLType::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10140,12 +9923,12 @@ void POA_CORBA_IDLType::_is_a_skel ( void POA_CORBA_IDLType::_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_IDLType *_tao_impl = (POA_CORBA_IDLType *) _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 (); @@ -10157,8 +9940,8 @@ void POA_CORBA_IDLType::_non_existent_skel ( void POA_CORBA_IDLType::_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_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference; @@ -10177,7 +9960,7 @@ void POA_CORBA_IDLType::_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 (); @@ -10203,11 +9986,11 @@ void POA_CORBA_IDLType::_interface_skel ( } CORBA::Boolean POA_CORBA_IDLType::_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 ( @@ -10232,12 +10015,12 @@ void* POA_CORBA_IDLType::_downcast ( return 0; } -void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV) +void POA_CORBA_IDLType::_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); } @@ -10247,9 +10030,9 @@ const char* POA_CORBA_IDLType::_interface_repository_id (void) const } CORBA_IDLType* -POA_CORBA_IDLType::_this (CORBA_Environment &ACE_TRY_ENV) +POA_CORBA_IDLType::_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); @@ -10437,18 +10220,18 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::~_TAO_CORBA_TypedefDef_Strategiz _TAO_CORBA_TypedefDef_Proxy_Impl& _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy ( - ::CORBA_TypedefDef *object, - CORBA::Environment &ACE_TRY_ENV + ::CORBA_TypedefDef *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]; @@ -10457,8 +10240,8 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy ( void _TAO_CORBA_TypedefDef_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_); @@ -10552,8 +10335,8 @@ POA_CORBA_TypedefDef::~POA_CORBA_TypedefDef (void) void POA_CORBA_TypedefDef::_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 (); @@ -10563,7 +10346,7 @@ void POA_CORBA_TypedefDef::_is_a_skel ( if (!(_tao_in >> value.out ())) ACE_THROW (CORBA::MARSHAL ()); - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); + _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; _tao_server_request.init_reply (); @@ -10575,12 +10358,12 @@ void POA_CORBA_TypedefDef::_is_a_skel ( void POA_CORBA_TypedefDef::_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_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _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 (); @@ -10592,8 +10375,8 @@ void POA_CORBA_TypedefDef::_non_existent_skel ( void POA_CORBA_TypedefDef::_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_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference; @@ -10612,7 +10395,7 @@ void POA_CORBA_TypedefDef::_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 (); @@ -10638,11 +10421,11 @@ void POA_CORBA_TypedefDef::_interface_skel ( } CORBA::Boolean POA_CORBA_TypedefDef::_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 ( @@ -10673,12 +10456,12 @@ void* POA_CORBA_TypedefDef::_downcast ( return 0; } -void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV) +void POA_CORBA_TypedefDef::_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); } @@ -10688,9 +10471,9 @@ const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const } CORBA_TypedefDef* -POA_CORBA_TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV) +POA_CORBA_TypedefDef::_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); |