diff options
Diffstat (limited to 'TAO/tao/IFR_Client/IFR_ExtendedC.cpp')
| -rw-r--r-- | TAO/tao/IFR_Client/IFR_ExtendedC.cpp | 2652 |
1 files changed, 1266 insertions, 1386 deletions
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 7bd5bcd8de2..400e30ee8bf 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -65,11 +65,11 @@ tao_CORBA_FixedDef_nil ( CORBA_FixedDef_ptr tao_CORBA_FixedDef_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return CORBA_FixedDef::_narrow (p, ACE_TRY_ENV); + return CORBA_FixedDef::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -192,11 +192,11 @@ CORBA_FixedDef_var::tao_nil (void) ::CORBA_FixedDef_ptr CORBA_FixedDef_var::tao_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return ::CORBA_FixedDef::_narrow (p, ACE_TRY_ENV); + return ::CORBA_FixedDef::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -273,27 +273,23 @@ class TAO_ClientRequestInfo_CORBA_FixedDef_digits_get : public TAO_ClientRequest public: TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA::UShort result); @@ -307,31 +303,31 @@ private: TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_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_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_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; @@ -339,13 +335,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (CORBA::Environment CORBA::Any * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_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; @@ -367,27 +363,23 @@ public: TAO_ClientRequestInfo_CORBA_FixedDef_digits_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::UShort & digits, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::UShort & digits + 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)); private: @@ -401,20 +393,20 @@ private: TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::TAO_ClientRequestInfo_CORBA_FixedDef_digits_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::UShort & digits, - CORBA::Environment & + const CORBA::UShort & digits + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), digits_ (digits) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_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; @@ -430,12 +422,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment & } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_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; @@ -443,13 +435,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (CORBA::Environment CORBA::Any * -TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_digits_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; @@ -460,27 +452,23 @@ class TAO_ClientRequestInfo_CORBA_FixedDef_scale_get : public TAO_ClientRequestI public: TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA::Short result); @@ -494,31 +482,31 @@ private: TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_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_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_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; @@ -526,13 +514,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (CORBA::Environment & CORBA::Any * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_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; @@ -554,27 +542,23 @@ public: TAO_ClientRequestInfo_CORBA_FixedDef_scale_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Short & scale, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Short & scale + 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)); private: @@ -588,20 +572,20 @@ private: TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::TAO_ClientRequestInfo_CORBA_FixedDef_scale_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Short & scale, - CORBA::Environment & + const CORBA::Short & scale + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), scale_ (scale) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_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; @@ -617,12 +601,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &A } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_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; @@ -630,13 +614,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (CORBA::Environment & CORBA::Any * -TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_FixedDef_scale_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; @@ -657,8 +641,8 @@ _TAO_CORBA_FixedDef_Remote_Proxy_Impl::_TAO_CORBA_FixedDef_Remote_Proxy_Impl (vo // Remote Implementation of the IDL interface methods CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -699,8 +683,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -715,8 +699,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -728,17 +712,17 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -754,8 +738,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -781,8 +765,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -791,13 +775,13 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -808,7 +792,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -824,8 +808,8 @@ return _tao_retval; void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( CORBA_Object *_collocated_tao_target_, - CORBA::UShort digits, - CORBA::Environment &ACE_TRY_ENV + CORBA::UShort digits + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -867,8 +851,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( TAO_ClientRequestInfo_CORBA_FixedDef_digits_set ri ( &_tao_call, _collocated_tao_target_, - digits, - ACE_TRY_ENV + digits + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -883,8 +867,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -896,12 +880,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -914,7 +898,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -929,8 +913,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -943,8 +927,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -953,13 +937,13 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -970,7 +954,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -985,8 +969,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits ( } CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1027,8 +1011,8 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -1043,8 +1027,8 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1056,17 +1040,17 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1082,8 +1066,8 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1109,8 +1093,8 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1119,13 +1103,13 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -1136,7 +1120,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1152,8 +1136,8 @@ return _tao_retval; void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( CORBA_Object *_collocated_tao_target_, - CORBA::Short scale, - CORBA::Environment &ACE_TRY_ENV + CORBA::Short scale + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -1195,8 +1179,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( TAO_ClientRequestInfo_CORBA_FixedDef_scale_set ri ( &_tao_call, _collocated_tao_target_, - scale, - ACE_TRY_ENV + scale + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -1211,8 +1195,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1224,12 +1208,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -1242,7 +1226,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -1257,8 +1241,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -1271,8 +1255,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -1281,13 +1265,13 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -1298,7 +1282,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -1352,8 +1336,8 @@ _TAO_CORBA_FixedDef_Remote_Proxy_Broker::~_TAO_CORBA_FixedDef_Remote_Proxy_Broke _TAO_CORBA_FixedDef_Proxy_Impl& _TAO_CORBA_FixedDef_Remote_Proxy_Broker::select_proxy ( - ::CORBA_FixedDef *, - CORBA::Environment & + ::CORBA_FixedDef * + TAO_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -1395,25 +1379,25 @@ void CORBA_FixedDef::_tao_any_destructor (void *_tao_void_pointer) } CORBA_FixedDef_ptr CORBA_FixedDef::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_FixedDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0", ACE_TRY_ENV); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_FixedDef::_nil ()); if (is_a == 0) return CORBA_FixedDef::_nil (); } - return CORBA_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV); + return CORBA_FixedDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); } CORBA_FixedDef_ptr CORBA_FixedDef::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -1468,7 +1452,7 @@ CORBA_FixedDef::_duplicate (CORBA_FixedDef_ptr obj) return obj; } -CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) +CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) || @@ -1477,7 +1461,7 @@ CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environme (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); + return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); } void *CORBA_FixedDef::_tao_QueryInterface (ptr_arith_t type) @@ -1526,74 +1510,74 @@ const char* CORBA_FixedDef::_interface_repository_id (void) const } CORBA::UShort CORBA_FixedDef::digits ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_FixedDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.digits ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_FixedDef::digits ( - CORBA::UShort digits, - CORBA::Environment &ACE_TRY_ENV + CORBA::UShort digits + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_FixedDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.digits ( this, - digits, - ACE_TRY_ENV + digits + TAO_ENV_ARG_PARAMETER ); } CORBA::Short CORBA_FixedDef::scale ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_FixedDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.scale ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_FixedDef::scale ( - CORBA::Short scale, - CORBA::Environment &ACE_TRY_ENV + CORBA::Short scale + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_FixedDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.scale ( this, - scale, - ACE_TRY_ENV + scale + TAO_ENV_ARG_PARAMETER ); } @@ -1726,11 +1710,11 @@ tao_CORBA_ValueMemberDef_nil ( CORBA_ValueMemberDef_ptr tao_CORBA_ValueMemberDef_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return CORBA_ValueMemberDef::_narrow (p, ACE_TRY_ENV); + return CORBA_ValueMemberDef::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1853,11 +1837,11 @@ CORBA_ValueMemberDef_var::tao_nil (void) ::CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef_var::tao_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return ::CORBA_ValueMemberDef::_narrow (p, ACE_TRY_ENV); + return ::CORBA_ValueMemberDef::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1934,27 +1918,23 @@ class TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get : public TAO_ClientReq public: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA::TypeCode_ptr result); @@ -1968,31 +1948,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_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_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_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; @@ -2000,13 +1980,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (CORBA::Environm CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_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; @@ -2027,27 +2007,23 @@ class TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get : public TAO_Clien public: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA_IDLType_ptr result); @@ -2061,31 +2037,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_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_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_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; @@ -2093,13 +2069,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (CORBA::Envi CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_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; @@ -2121,27 +2097,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - CORBA_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA_IDLType_ptr 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)); private: @@ -2155,20 +2127,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - CORBA_IDLType_ptr type_def, - CORBA::Environment & + CORBA_IDLType_ptr type_def + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), type_def_ (type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_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; @@ -2184,12 +2156,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Envir } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_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; @@ -2197,13 +2169,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (CORBA::Envi CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_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; @@ -2214,27 +2186,23 @@ class TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ClientR public: TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA::Visibility result); @@ -2248,31 +2216,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_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_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_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; @@ -2280,13 +2248,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (CORBA::Enviro CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_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; @@ -2308,27 +2276,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Visibility & access, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Visibility & access + 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)); private: @@ -2342,20 +2306,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Visibility & access, - CORBA::Environment & + const CORBA::Visibility & access + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), access_ (access) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_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; @@ -2371,12 +2335,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_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; @@ -2384,13 +2348,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (CORBA::Enviro CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_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; @@ -2411,8 +2375,8 @@ _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::_TAO_CORBA_ValueMemberDef_Remote_Pr // Remote Implementation of the IDL interface methods CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_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 @@ -2454,8 +2418,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2470,8 +2434,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2483,17 +2447,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2509,8 +2473,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2537,8 +2501,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2547,13 +2511,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -2564,7 +2528,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2579,8 +2543,8 @@ return _tao_safe_retval._retn (); } CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2622,8 +2586,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -2638,8 +2602,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2651,17 +2615,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2677,8 +2641,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2705,8 +2669,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2715,13 +2679,13 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -2732,7 +2696,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2748,8 +2712,8 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( CORBA_Object *_collocated_tao_target_, - CORBA_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV + CORBA_IDLType_ptr type_def + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2791,8 +2755,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set ri ( &_tao_call, _collocated_tao_target_, - type_def, - ACE_TRY_ENV + type_def + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -2807,8 +2771,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2820,12 +2784,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -2838,7 +2802,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -2853,8 +2817,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -2867,8 +2831,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2877,13 +2841,13 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -2894,7 +2858,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -2909,8 +2873,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def ( } CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -2951,8 +2915,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -2967,8 +2931,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -2980,17 +2944,17 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3006,8 +2970,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3033,8 +2997,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3043,13 +3007,13 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -3060,7 +3024,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3076,8 +3040,8 @@ return _tao_retval; void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( CORBA_Object *_collocated_tao_target_, - CORBA::Visibility access, - CORBA::Environment &ACE_TRY_ENV + CORBA::Visibility access + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -3119,8 +3083,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set ri ( &_tao_call, _collocated_tao_target_, - access, - ACE_TRY_ENV + access + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -3135,8 +3099,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3148,12 +3112,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -3166,7 +3130,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -3181,8 +3145,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -3195,8 +3159,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -3205,13 +3169,13 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -3222,7 +3186,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -3276,8 +3240,8 @@ _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_Remote _TAO_CORBA_ValueMemberDef_Proxy_Impl& _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::select_proxy ( - ::CORBA_ValueMemberDef *, - CORBA::Environment & + ::CORBA_ValueMemberDef * + TAO_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -3319,25 +3283,25 @@ void CORBA_ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer) } CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ValueMemberDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0", ACE_TRY_ENV); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueMemberDef::_nil ()); if (is_a == 0) return CORBA_ValueMemberDef::_nil (); } - return CORBA_ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV); + return CORBA_ValueMemberDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); } CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -3392,7 +3356,7 @@ CORBA_ValueMemberDef::_duplicate (CORBA_ValueMemberDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) +CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) || @@ -3401,7 +3365,7 @@ CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Env (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); + return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); } void *CORBA_ValueMemberDef::_tao_QueryInterface (ptr_arith_t type) @@ -3450,91 +3414,91 @@ const char* CORBA_ValueMemberDef::_interface_repository_id (void) const } CORBA::TypeCode_ptr CORBA_ValueMemberDef::type ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } CORBA_IDLType_ptr CORBA_ValueMemberDef::type_def ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.type_def ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueMemberDef::type_def ( - CORBA_IDLType_ptr type_def, - CORBA::Environment &ACE_TRY_ENV + CORBA_IDLType_ptr type_def + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.type_def ( this, - type_def, - ACE_TRY_ENV + type_def + TAO_ENV_ARG_PARAMETER ); } CORBA::Visibility CORBA_ValueMemberDef::access ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.access ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueMemberDef::access ( - CORBA::Visibility access, - CORBA::Environment &ACE_TRY_ENV + CORBA::Visibility access + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.access ( this, - access, - ACE_TRY_ENV + access + TAO_ENV_ARG_PARAMETER ); } @@ -3564,11 +3528,11 @@ tao_CORBA_ValueDef_nil ( CORBA_ValueDef_ptr tao_CORBA_ValueDef_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return CORBA_ValueDef::_narrow (p, ACE_TRY_ENV); + return CORBA_ValueDef::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3691,11 +3655,11 @@ CORBA_ValueDef_var::tao_nil (void) ::CORBA_ValueDef_ptr CORBA_ValueDef_var::tao_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return ::CORBA_ValueDef::_narrow (p, ACE_TRY_ENV); + return ::CORBA_ValueDef::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3772,27 +3736,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get : public TAO public: TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA_InterfaceDefSeq * result); @@ -3806,31 +3766,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_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_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_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; @@ -3838,13 +3798,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (CORBA CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_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; @@ -3866,27 +3826,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA_InterfaceDefSeq & supported_interfaces, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_InterfaceDefSeq & supported_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)); private: @@ -3900,20 +3856,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA_InterfaceDefSeq & supported_interfaces, - CORBA::Environment & + const CORBA_InterfaceDefSeq & supported_interfaces + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), supported_interfaces_ (supported_interfaces) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_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; @@ -3929,12 +3885,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_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; @@ -3942,13 +3898,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (CORBA CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_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; @@ -3959,27 +3915,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ClientR public: TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA_InitializerSeq * result); @@ -3993,31 +3945,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_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_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_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; @@ -4025,13 +3977,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (CORBA::Enviro CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_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; @@ -4053,27 +4005,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - 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)); private: @@ -4087,20 +4035,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA_InitializerSeq & initializers, - CORBA::Environment & + const CORBA_InitializerSeq & initializers + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), initializers_ (initializers) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_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; @@ -4116,12 +4064,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_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; @@ -4129,13 +4077,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (CORBA::Enviro CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_initializers_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; @@ -4146,27 +4094,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ClientReq public: TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA_ValueDef_ptr result); @@ -4180,31 +4124,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_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_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_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; @@ -4212,13 +4156,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (CORBA::Environm CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_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; @@ -4240,27 +4184,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - CORBA_ValueDef_ptr base_value, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA_ValueDef_ptr base_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)); private: @@ -4274,20 +4214,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - CORBA_ValueDef_ptr base_value, - CORBA::Environment & + CORBA_ValueDef_ptr base_value + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), base_value_ (base_value) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_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; @@ -4303,12 +4243,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environme } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_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; @@ -4316,13 +4256,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (CORBA::Environm CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_base_value_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; @@ -4333,27 +4273,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO public: TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA_ValueDefSeq * result); @@ -4367,31 +4303,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_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_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_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; @@ -4399,13 +4335,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (CORBA CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_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; @@ -4427,27 +4363,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA_ValueDefSeq & abstract_base_values, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_ValueDefSeq & abstract_base_values + 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)); private: @@ -4461,20 +4393,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA_ValueDefSeq & abstract_base_values, - CORBA::Environment & + const CORBA_ValueDefSeq & abstract_base_values + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), abstract_base_values_ (abstract_base_values) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_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; @@ -4490,12 +4422,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_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; @@ -4503,13 +4435,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (CORBA CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_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; @@ -4520,27 +4452,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ClientRe public: TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA::Boolean result); @@ -4554,31 +4482,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_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_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_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; @@ -4586,13 +4514,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (CORBA::Environ CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_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; @@ -4614,27 +4542,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Boolean & is_abstract, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Boolean & is_abstract + 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)); private: @@ -4648,20 +4572,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Boolean & is_abstract, - CORBA::Environment & + const CORBA::Boolean & is_abstract + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), is_abstract_ (is_abstract) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_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; @@ -4677,12 +4601,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environm } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_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; @@ -4690,13 +4614,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (CORBA::Environ CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_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; @@ -4707,27 +4631,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ClientRequ public: TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA::Boolean result); @@ -4741,31 +4661,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_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_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_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; @@ -4773,13 +4693,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (CORBA::Environme CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_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; @@ -4801,27 +4721,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Boolean & is_custom, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Boolean & is_custom + 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)); private: @@ -4835,20 +4751,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Boolean & is_custom, - CORBA::Environment & + const CORBA::Boolean & is_custom + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), is_custom_ (is_custom) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_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; @@ -4864,12 +4780,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environmen } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_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; @@ -4877,13 +4793,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (CORBA::Environme CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_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; @@ -4894,27 +4810,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_Clien public: TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA::Boolean result); @@ -4928,31 +4840,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_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_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_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; @@ -4960,13 +4872,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (CORBA::Envi CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_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; @@ -4988,27 +4900,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Boolean & is_truncatable, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Boolean & is_truncatable + 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)); private: @@ -5022,20 +4930,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const CORBA::Boolean & is_truncatable, - CORBA::Environment & + const CORBA::Boolean & is_truncatable + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), is_truncatable_ (is_truncatable) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_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; @@ -5051,12 +4959,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Envir } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_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; @@ -5064,13 +4972,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (CORBA::Envi CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_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; @@ -5082,27 +4990,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueDef_is_a ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - 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)); void result (CORBA::Boolean result); @@ -5118,20 +5022,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_is_a::TAO_ClientRequestInfo_CORBA_ValueDef_is_a ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - const char * id, - CORBA::Environment & + const char * id + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), id_ (id) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_a::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; @@ -5147,12 +5051,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TR } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_a::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; @@ -5160,13 +5064,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (CORBA::Environment &ACE_T CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_is_a::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; @@ -5187,27 +5091,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_describe_value : public TAO_ClientReq public: TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA_ValueDef::FullValueDescription * result); @@ -5221,31 +5121,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_describe_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); return parameter_list; } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_describe_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; @@ -5253,13 +5153,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (CORBA::Environm CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_describe_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; @@ -5285,27 +5185,23 @@ public: const char * name, const char * version, CORBA_IDLType_ptr type, - const CORBA::Visibility & access, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA::Visibility & access + 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)); void result (CORBA_ValueMemberDef_ptr result); @@ -5329,8 +5225,8 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_ const char * name, const char * version, CORBA_IDLType_ptr type, - const CORBA::Visibility & access, - CORBA::Environment & + const CORBA::Visibility & access + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), id_ (id), @@ -5341,12 +5237,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_ {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::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; @@ -5374,12 +5270,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Envi } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::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; @@ -5387,13 +5283,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (CORBA::Env CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::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; @@ -5419,27 +5315,23 @@ public: const char * name, const char * version, CORBA_IDLType_ptr type, - CORBA::AttributeMode & mode, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::AttributeMode & mode + 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)); void result (CORBA_AttributeDef_ptr result); @@ -5463,8 +5355,8 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR const char * name, const char * version, CORBA_IDLType_ptr type, - CORBA::AttributeMode & mode, - CORBA::Environment & + CORBA::AttributeMode & mode + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), id_ (id), @@ -5475,12 +5367,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::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; @@ -5508,12 +5400,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::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; @@ -5521,13 +5413,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (CORBA::Enviro CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::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; @@ -5556,27 +5448,23 @@ public: CORBA::OperationMode & mode, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, - const CORBA_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + const CORBA_ContextIdSeq & contexts + 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)); void result (CORBA_OperationDef_ptr result); @@ -5606,8 +5494,8 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR CORBA::OperationMode & mode, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, - const CORBA_ContextIdSeq & contexts, - CORBA::Environment & + const CORBA_ContextIdSeq & contexts + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), id_ (id), @@ -5621,12 +5509,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::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; @@ -5663,12 +5551,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environ } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::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; @@ -5676,13 +5564,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (CORBA::Enviro CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::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; @@ -5713,8 +5601,8 @@ _TAO_CORBA_ValueDef_Remote_Proxy_Impl::_TAO_CORBA_ValueDef_Remote_Proxy_Impl (vo // Remote Implementation of the IDL interface methods CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5757,8 +5645,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -5773,8 +5661,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5786,17 +5674,17 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -5812,8 +5700,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -5840,8 +5728,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5850,13 +5738,13 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -5867,7 +5755,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -5883,8 +5771,8 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( CORBA_Object *_collocated_tao_target_, - const CORBA_InterfaceDefSeq & supported_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InterfaceDefSeq & supported_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -5926,8 +5814,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set ri ( &_tao_call, _collocated_tao_target_, - supported_interfaces, - ACE_TRY_ENV + supported_interfaces + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -5942,8 +5830,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -5955,12 +5843,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -5973,7 +5861,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -5988,8 +5876,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6002,8 +5890,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6012,13 +5900,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -6029,7 +5917,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6044,8 +5932,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces ( } CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6088,8 +5976,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -6104,8 +5992,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6117,17 +6005,17 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6143,8 +6031,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6171,8 +6059,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6181,13 +6069,13 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -6198,7 +6086,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6214,8 +6102,8 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( CORBA_Object *_collocated_tao_target_, - const CORBA_InitializerSeq & initializers, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InitializerSeq & initializers + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6257,8 +6145,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set ri ( &_tao_call, _collocated_tao_target_, - initializers, - ACE_TRY_ENV + initializers + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -6273,8 +6161,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6286,12 +6174,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6304,7 +6192,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6319,8 +6207,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6333,8 +6221,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6343,13 +6231,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -6360,7 +6248,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6375,8 +6263,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers ( } CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6418,8 +6306,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -6434,8 +6322,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6447,17 +6335,17 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6473,8 +6361,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6501,8 +6389,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6511,13 +6399,13 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -6528,7 +6416,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6544,8 +6432,8 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( CORBA_Object *_collocated_tao_target_, - CORBA_ValueDef_ptr base_value, - CORBA::Environment &ACE_TRY_ENV + CORBA_ValueDef_ptr base_value + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6587,8 +6475,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set ri ( &_tao_call, _collocated_tao_target_, - base_value, - ACE_TRY_ENV + base_value + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -6603,8 +6491,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6616,12 +6504,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6634,7 +6522,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6649,8 +6537,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6663,8 +6551,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6673,13 +6561,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -6690,7 +6578,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6705,8 +6593,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value ( } CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6749,8 +6637,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -6765,8 +6653,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6778,17 +6666,17 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6804,8 +6692,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6832,8 +6720,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6842,13 +6730,13 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -6859,7 +6747,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -6875,8 +6763,8 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( CORBA_Object *_collocated_tao_target_, - const CORBA_ValueDefSeq & abstract_base_values, - CORBA::Environment &ACE_TRY_ENV + const CORBA_ValueDefSeq & abstract_base_values + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -6918,8 +6806,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set ri ( &_tao_call, _collocated_tao_target_, - abstract_base_values, - ACE_TRY_ENV + abstract_base_values + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -6934,8 +6822,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -6947,12 +6835,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -6965,7 +6853,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -6980,8 +6868,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -6994,8 +6882,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7004,13 +6892,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -7021,7 +6909,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7036,8 +6924,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values ( } CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7078,8 +6966,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -7094,8 +6982,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7107,17 +6995,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7133,8 +7021,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7160,8 +7048,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7170,13 +7058,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -7187,7 +7075,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7203,8 +7091,8 @@ return _tao_retval; void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( CORBA_Object *_collocated_tao_target_, - CORBA::Boolean is_abstract, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean is_abstract + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7246,8 +7134,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set ri ( &_tao_call, _collocated_tao_target_, - is_abstract, - ACE_TRY_ENV + is_abstract + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -7262,8 +7150,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7275,12 +7163,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7293,7 +7181,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7308,8 +7196,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7322,8 +7210,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7332,13 +7220,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -7349,7 +7237,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7364,8 +7252,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract ( } CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7406,8 +7294,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -7422,8 +7310,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7435,17 +7323,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7461,8 +7349,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7488,8 +7376,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7498,13 +7386,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -7515,7 +7403,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7531,8 +7419,8 @@ return _tao_retval; void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( CORBA_Object *_collocated_tao_target_, - CORBA::Boolean is_custom, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean is_custom + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7574,8 +7462,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set ri ( &_tao_call, _collocated_tao_target_, - is_custom, - ACE_TRY_ENV + is_custom + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -7590,8 +7478,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7603,12 +7491,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7621,7 +7509,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7636,8 +7524,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7650,8 +7538,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7660,13 +7548,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -7677,7 +7565,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7692,8 +7580,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom ( } CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7734,8 +7622,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -7750,8 +7638,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7763,17 +7651,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7789,8 +7677,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7816,8 +7704,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7826,13 +7714,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -7843,7 +7731,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -7859,8 +7747,8 @@ return _tao_retval; void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( CORBA_Object *_collocated_tao_target_, - CORBA::Boolean is_truncatable, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean is_truncatable + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -7902,8 +7790,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set ri ( &_tao_call, _collocated_tao_target_, - is_truncatable, - ACE_TRY_ENV + is_truncatable + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -7918,8 +7806,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7931,12 +7819,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -7949,7 +7837,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -7964,8 +7852,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -7978,8 +7866,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -7988,13 +7876,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -8005,7 +7893,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8021,8 +7909,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable ( CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( 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 @@ -8064,8 +7952,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( TAO_ClientRequestInfo_CORBA_ValueDef_is_a ri ( &_tao_call, _collocated_tao_target_, - id, - ACE_TRY_ENV + id + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); @@ -8080,8 +7968,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8093,12 +7981,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -8112,7 +8000,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8128,8 +8016,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8155,8 +8043,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8165,13 +8053,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -8182,7 +8070,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a ( ACE_CHECK_RETURN (_tao_retval); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8197,8 +8085,8 @@ return _tao_retval; } CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::describe_value ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8240,8 +8128,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8256,8 +8144,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8269,17 +8157,17 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8295,8 +8183,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8323,8 +8211,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8333,13 +8221,13 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -8350,7 +8238,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8370,8 +8258,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem const char * name, const char * version, CORBA_IDLType_ptr type, - CORBA::Visibility access, - CORBA::Environment &ACE_TRY_ENV + CORBA::Visibility access + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8418,8 +8306,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem name, version, type, - access, - ACE_TRY_ENV + access + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8434,8 +8322,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8447,12 +8335,12 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8470,7 +8358,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8486,8 +8374,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8514,8 +8402,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8524,13 +8412,13 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -8541,7 +8429,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8561,8 +8449,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( const char * name, const char * version, CORBA_IDLType_ptr type, - CORBA::AttributeMode mode, - CORBA::Environment &ACE_TRY_ENV + CORBA::AttributeMode mode + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8609,8 +8497,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( name, version, type, - mode, - ACE_TRY_ENV + mode + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8625,8 +8513,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8638,12 +8526,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8661,7 +8549,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8677,8 +8565,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8705,8 +8593,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8715,13 +8603,13 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -8732,7 +8620,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8755,8 +8643,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( CORBA::OperationMode mode, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, - const CORBA_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV + const CORBA_ContextIdSeq & contexts + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -8806,8 +8694,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( mode, params, exceptions, - contexts, - ACE_TRY_ENV + contexts + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -8822,8 +8710,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8835,12 +8723,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -8861,7 +8749,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -8877,8 +8765,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -8905,8 +8793,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -8915,13 +8803,13 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -8932,7 +8820,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -8986,8 +8874,8 @@ _TAO_CORBA_ValueDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueDef_Remote_Proxy_Broke _TAO_CORBA_ValueDef_Proxy_Impl& _TAO_CORBA_ValueDef_Remote_Proxy_Broker::select_proxy ( - ::CORBA_ValueDef *, - CORBA::Environment & + ::CORBA_ValueDef * + TAO_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -9033,25 +8921,25 @@ void CORBA_ValueDef::_tao_any_destructor (void *_tao_void_pointer) } CORBA_ValueDef_ptr CORBA_ValueDef::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ValueDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0", ACE_TRY_ENV); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueDef::_nil ()); if (is_a == 0) return CORBA_ValueDef::_nil (); } - return CORBA_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV); + return CORBA_ValueDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); } CORBA_ValueDef_ptr CORBA_ValueDef::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -9106,7 +8994,7 @@ CORBA_ValueDef::_duplicate (CORBA_ValueDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) +CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) || @@ -9117,7 +9005,7 @@ CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environme (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); + return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); } void *CORBA_ValueDef::_tao_QueryInterface (ptr_arith_t type) @@ -9190,273 +9078,273 @@ const char* CORBA_ValueDef::_interface_repository_id (void) const } CORBA_InterfaceDefSeq * CORBA_ValueDef::supported_interfaces ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.supported_interfaces ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::supported_interfaces ( - const CORBA_InterfaceDefSeq & supported_interfaces, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InterfaceDefSeq & supported_interfaces + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.supported_interfaces ( this, - supported_interfaces, - ACE_TRY_ENV + supported_interfaces + TAO_ENV_ARG_PARAMETER ); } CORBA_InitializerSeq * CORBA_ValueDef::initializers ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.initializers ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::initializers ( - const CORBA_InitializerSeq & initializers, - CORBA::Environment &ACE_TRY_ENV + const CORBA_InitializerSeq & initializers + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.initializers ( this, - initializers, - ACE_TRY_ENV + initializers + TAO_ENV_ARG_PARAMETER ); } CORBA_ValueDef_ptr CORBA_ValueDef::base_value ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.base_value ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::base_value ( - CORBA_ValueDef_ptr base_value, - CORBA::Environment &ACE_TRY_ENV + CORBA_ValueDef_ptr base_value + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.base_value ( this, - base_value, - ACE_TRY_ENV + base_value + TAO_ENV_ARG_PARAMETER ); } CORBA_ValueDefSeq * CORBA_ValueDef::abstract_base_values ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.abstract_base_values ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::abstract_base_values ( - const CORBA_ValueDefSeq & abstract_base_values, - CORBA::Environment &ACE_TRY_ENV + const CORBA_ValueDefSeq & abstract_base_values + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.abstract_base_values ( this, - abstract_base_values, - ACE_TRY_ENV + abstract_base_values + TAO_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_ValueDef::is_abstract ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_abstract ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::is_abstract ( - CORBA::Boolean is_abstract, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean is_abstract + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.is_abstract ( this, - is_abstract, - ACE_TRY_ENV + is_abstract + TAO_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_ValueDef::is_custom ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_custom ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::is_custom ( - CORBA::Boolean is_custom, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean is_custom + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.is_custom ( this, - is_custom, - ACE_TRY_ENV + is_custom + TAO_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_ValueDef::is_truncatable ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_truncatable ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueDef::is_truncatable ( - CORBA::Boolean is_truncatable, - CORBA::Environment &ACE_TRY_ENV + CORBA::Boolean is_truncatable + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.is_truncatable ( this, - is_truncatable, - ACE_TRY_ENV + is_truncatable + TAO_ENV_ARG_PARAMETER ); } CORBA::Boolean CORBA_ValueDef::is_a ( - const char * id, - CORBA::Environment &ACE_TRY_ENV + const char * id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.is_a ( this, - id, - ACE_TRY_ENV + id + TAO_ENV_ARG_PARAMETER ); } @@ -10840,19 +10728,19 @@ void CORBA_ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void_ } CORBA_ValueDef::FullValueDescription * CORBA_ValueDef::describe_value ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.describe_value ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } @@ -10861,15 +10749,15 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member ( const char * name, const char * version, CORBA_IDLType_ptr type, - CORBA::Visibility access, - CORBA::Environment &ACE_TRY_ENV + CORBA::Visibility access + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_value_member ( @@ -10878,8 +10766,8 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member ( name, version, type, - access, - ACE_TRY_ENV + access + TAO_ENV_ARG_PARAMETER ); } @@ -10888,15 +10776,15 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute ( const char * name, const char * version, CORBA_IDLType_ptr type, - CORBA::AttributeMode mode, - CORBA::Environment &ACE_TRY_ENV + CORBA::AttributeMode mode + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_attribute ( @@ -10905,8 +10793,8 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute ( name, version, type, - mode, - ACE_TRY_ENV + mode + TAO_ENV_ARG_PARAMETER ); } @@ -10918,15 +10806,15 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation ( CORBA::OperationMode mode, const CORBA_ParDescriptionSeq & params, const CORBA_ExceptionDefSeq & exceptions, - const CORBA_ContextIdSeq & contexts, - CORBA::Environment &ACE_TRY_ENV + const CORBA_ContextIdSeq & contexts + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.create_operation ( @@ -10938,8 +10826,8 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation ( mode, params, exceptions, - contexts, - ACE_TRY_ENV + contexts + TAO_ENV_ARG_PARAMETER ); } @@ -10976,11 +10864,11 @@ tao_CORBA_ValueBoxDef_nil ( CORBA_ValueBoxDef_ptr tao_CORBA_ValueBoxDef_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return CORBA_ValueBoxDef::_narrow (p, ACE_TRY_ENV); + return CORBA_ValueBoxDef::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -11103,11 +10991,11 @@ CORBA_ValueBoxDef_var::tao_nil (void) ::CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef_var::tao_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return ::CORBA_ValueBoxDef::_narrow (p, ACE_TRY_ENV); + return ::CORBA_ValueBoxDef::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -11184,27 +11072,23 @@ class TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get : public TAO public: TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr _tao_target + 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)); void result (CORBA_IDLType_ptr result); @@ -11218,31 +11102,31 @@ private: TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ( TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::Environment & + CORBA::Object_ptr _tao_target + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_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_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_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; @@ -11250,13 +11134,13 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (CORBA CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_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; @@ -11278,27 +11162,23 @@ public: TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - 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)); private: @@ -11312,20 +11192,20 @@ private: TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - CORBA_IDLType_ptr original_type_def, - CORBA::Environment & + CORBA_IDLType_ptr original_type_def + TAO_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo (_tao_invocation, _tao_target), original_type_def_ (original_type_def) {} Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_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; @@ -11341,12 +11221,12 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA: } Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_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; @@ -11354,13 +11234,13 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (CORBA CORBA::Any * -TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV) +TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_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; @@ -11381,8 +11261,8 @@ _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Im // Remote Implementation of the IDL interface methods CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV + CORBA_Object *_collocated_tao_target_ + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -11424,8 +11304,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ri ( &_tao_call, - _collocated_tao_target_, - ACE_TRY_ENV + _collocated_tao_target_ + TAO_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (0); @@ -11440,8 +11320,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11453,17 +11333,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK_RETURN (0); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (0); if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11479,8 +11359,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11507,8 +11387,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11517,13 +11397,13 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -11534,7 +11414,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ACE_CHECK_RETURN (0); PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11550,8 +11430,8 @@ return _tao_safe_retval._retn (); void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( CORBA_Object *_collocated_tao_target_, - 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 @@ -11593,8 +11473,8 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set ri ( &_tao_call, _collocated_tao_target_, - original_type_def, - ACE_TRY_ENV + original_type_def + TAO_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -11609,8 +11489,8 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ACE_TRY { _tao_vfr.send_request ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11622,12 +11502,12 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( #endif /* TAO_HAS_INTERCEPTORS */ - _tao_call.start (ACE_TRY_ENV); + _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag), - ACE_TRY_ENV + ACE_static_cast (CORBA::Octet, _tao_response_flag) + TAO_ENV_ARG_PARAMETER ); TAO_INTERCEPTOR_CHECK; @@ -11640,7 +11520,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ); _invoke_status = - _tao_call.invoke (0, 0, ACE_TRY_ENV); + _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; if (_invoke_status == TAO_INVOKE_EXCEPTION) @@ -11655,8 +11535,8 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( TAO_INTERCEPTOR ( ri.reply_status (_invoke_status); _tao_vfr.receive_other ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; ) @@ -11669,8 +11549,8 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( - &ri, - ACE_TRY_ENV + &ri + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -11679,13 +11559,13 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( { ri.exception (&ACE_ANY_EXCEPTION); _tao_vfr.receive_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 @@ -11696,7 +11576,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def ( ACE_CHECK; PortableInterceptor::ReplyStatus _tao_status = - ri.reply_status (ACE_TRY_ENV); + ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (_tao_status == PortableInterceptor::LOCATION_FORWARD @@ -11750,8 +11630,8 @@ _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Remote_Proxy _TAO_CORBA_ValueBoxDef_Proxy_Impl& _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::select_proxy ( - ::CORBA_ValueBoxDef *, - CORBA::Environment & + ::CORBA_ValueBoxDef * + TAO_ENV_ARG_DECL_NOT_USED ) { return this->remote_proxy_impl_; @@ -11793,25 +11673,25 @@ void CORBA_ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer) } CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL ) { if (CORBA::is_nil (obj)) return CORBA_ValueBoxDef::_nil (); if (! obj->_is_local ()) { - CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0", ACE_TRY_ENV); + CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ()); if (is_a == 0) return CORBA_ValueBoxDef::_nil (); } - return CORBA_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV); + return CORBA_ValueBoxDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); } CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) @@ -11866,7 +11746,7 @@ CORBA_ValueBoxDef::_duplicate (CORBA_ValueBoxDef_ptr obj) return obj; } -CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) +CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) || @@ -11877,7 +11757,7 @@ CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Enviro (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); + return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER); } void *CORBA_ValueBoxDef::_tao_QueryInterface (ptr_arith_t type) @@ -11950,38 +11830,38 @@ const char* CORBA_ValueBoxDef::_interface_repository_id (void) const } CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return proxy.original_type_def ( - this, - ACE_TRY_ENV + this + TAO_ENV_ARG_PARAMETER ); } void CORBA_ValueBoxDef::original_type_def ( - 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 )) { _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy = - this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV); + this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; proxy.original_type_def ( this, - original_type_def, - ACE_TRY_ENV + original_type_def + TAO_ENV_ARG_PARAMETER ); } @@ -12008,7 +11888,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_FixedDef_ptr &_tao _tao_elem = CORBA_FixedDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef, ACE_TRY_ENV); + CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12083,7 +11963,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMember { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember, ACE_TRY_ENV); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12174,7 +12054,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMemberS { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq, ACE_TRY_ENV); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12243,7 +12123,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueMemberDef_ptr _tao_elem = CORBA_ValueMemberDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef, ACE_TRY_ENV); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12304,7 +12184,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDef_ptr &_tao _tao_elem = CORBA_ValueDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef, ACE_TRY_ENV); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12379,7 +12259,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDef::Fu { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription, ACE_TRY_ENV); + CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12462,7 +12342,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDescrip { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription, ACE_TRY_ENV); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12531,7 +12411,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueBoxDef_ptr &_ _tao_elem = CORBA_ValueBoxDef::_nil (); CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef, ACE_TRY_ENV); + CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!result) @@ -12591,8 +12471,8 @@ CORBA::Boolean operator>> ( // narrow to the right type _tao_objref = CORBA_FixedDef::_unchecked_narrow ( - obj.in (), - ACE_TRY_ENV + obj.in () + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -12669,8 +12549,8 @@ CORBA::Boolean operator>> ( // narrow to the right type _tao_objref = CORBA_ValueMemberDef::_unchecked_narrow ( - obj.in (), - ACE_TRY_ENV + obj.in () + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -12705,8 +12585,8 @@ CORBA::Boolean operator>> ( // narrow to the right type _tao_objref = CORBA_ValueDef::_unchecked_narrow ( - obj.in (), - ACE_TRY_ENV + obj.in () + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; @@ -12741,8 +12621,8 @@ CORBA::Boolean operator>> ( // narrow to the right type _tao_objref = CORBA_ValueBoxDef::_unchecked_narrow ( - obj.in (), - ACE_TRY_ENV + obj.in () + TAO_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; return 1; |