summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-05-23 22:53:25 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-05-23 22:53:25 +0000
commitd90045f387b77c7f7ab03aa93527cb5862481a55 (patch)
tree8a3a64051942ec54e2af9758400bd5e8ad9d406c
parent1758e5bcba98deb2fe9774ca253d5e8306b40f36 (diff)
downloadATCD-d90045f387b77c7f7ab03aa93527cb5862481a55.tar.gz
ChangeLogTag:Fri May 23 17:49:51 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/tao/IORInterceptor_Adapter.h2
-rw-r--r--TAO/tao/ORB_Core.cpp3
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;
}
}