diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp')
| -rw-r--r-- | TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index d05c9d84a28..f5a3bb414e6 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -15,31 +15,28 @@ PortableInterceptor::SlotId slot_id = 2093843221; void ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = - info->resolve_initial_references ("PICurrent" - ACE_ENV_ARG_PARAMETER); + info->resolve_initial_references ("PICurrent"); PortableInterceptor::Current_var pi_current = - PortableInterceptor::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::Current::_narrow (obj.in ()); if (CORBA::is_nil (pi_current.in ())) { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Could not resolve PICurrent object.\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ::slot_id = info->allocate_slot_id (); @@ -57,8 +54,7 @@ ServerORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = server_tmp; - info->add_server_request_interceptor (server_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (server_interceptor.in ()); PortableInterceptor::ClientRequestInterceptor_ptr client_tmp; ACE_NEW_THROW_EX (client_tmp, @@ -72,8 +68,7 @@ ServerORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = client_tmp; - info->add_client_request_interceptor (client_interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (client_interceptor.in ()); // Disable collocation -- TAO-specific!!! // @@ -82,8 +77,7 @@ ServerORBInitializer::post_init ( // invocations yet, and we need to force a client request // interceptor to be invoked in this server. TAO_ORBInitInfo_var tao_info = - TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); + TAO_ORBInitInfo::_narrow (info); tao_info->orb_core ()->optimize_collocation_objects (0); } |