diff options
Diffstat (limited to 'TAO/tests/ORT/ORT_test_IORInterceptor.cpp')
| -rw-r--r-- | TAO/tests/ORT/ORT_test_IORInterceptor.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp index 38fcec43f31..3287952f4e2 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp @@ -15,14 +15,14 @@ ORT_test_IORInterceptor::ORT_test_IORInterceptor (void) } char * -ORT_test_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ORT_test_IORInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ORT_IORInterceptor"); } void -ORT_test_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ORT_test_IORInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (this->establish_count_ > 0 @@ -32,8 +32,7 @@ ORT_test_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void ORT_test_IORInterceptor::establish_components ( - PortableInterceptor::IORInfo_ptr /* info */ - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::IORInfo_ptr /* info */) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->establish_count_; @@ -45,8 +44,7 @@ ORT_test_IORInterceptor::establish_components ( void ORT_test_IORInterceptor::components_established ( - PortableInterceptor::IORInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::IORInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->components_establish_count_; @@ -60,8 +58,7 @@ ORT_test_IORInterceptor::components_established ( // Save a copy of the current ObjectReferenceFactory. PortableInterceptor::ObjectReferenceFactory_var old_orf = - info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->current_factory (); PortableInterceptor::ObjectReferenceFactory * tmp; ACE_NEW_THROW_EX (tmp, @@ -71,20 +68,16 @@ ORT_test_IORInterceptor::components_established ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ObjectReferenceFactory_var orf = tmp; - info->current_factory (orf.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + info->current_factory (orf.in ()); } void ORT_test_IORInterceptor::adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::AdapterState) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -94,8 +87,7 @@ ORT_test_IORInterceptor::adapter_manager_state_changed ( void ORT_test_IORInterceptor:: adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, - PortableInterceptor::AdapterState - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::AdapterState) ACE_THROW_SPEC ((CORBA::SystemException)) { } |