diff options
| -rw-r--r-- | TAO/tao/IORInterceptor_Adapter.h | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index ba88c7e0aa0..ddad582003c 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -56,7 +56,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; virtual void destroy_interceptors ( - ACE_ENV_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 06f93f054f6..3299e2a759b 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1957,7 +1957,6 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { - ACE_TRY { #if TAO_HAS_INTERCEPTORS == 1 @@ -2018,7 +2017,7 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) { this->ior_interceptor_adapter_->destroy_interceptors ( ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_TRY_CHECK; } } |