diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-05-23 22:50:33 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-05-23 22:50:33 +0000 |
| commit | 1758e5bcba98deb2fe9774ca253d5e8306b40f36 (patch) | |
| tree | 2466640df66dcd3f8bc2ceed143573a40c4b1459 | |
| parent | 18271f0fd1eaeea32a96fbd7da3ed4d3a3f6d040 (diff) | |
| download | ATCD-1758e5bcba98deb2fe9774ca253d5e8306b40f36.tar.gz | |
ChangeLogTag:Fri May 23 17:49:51 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 598c8158fd8..cf2b5fc4b54 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri May 23 17:49:51 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/ORB_Core.cpp (destroy_interceptors): Fixed warning in builds + where interceptors are turned off. + Fri May 23 17:40:53 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/ORB_Core.cpp (add_interceptor): Fixed compilation errors in diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index a12a151848c..06f93f054f6 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1956,12 +1956,14 @@ void TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { - size_t len = 0; // The length of the interceptor array. - size_t ilen = 0; // The incremental length of the interceptor array. + ACE_TRY { #if TAO_HAS_INTERCEPTORS == 1 + size_t len = 0; // The length of the interceptor array. + size_t ilen = 0; // The incremental length of the interceptor array. + TAO_ClientRequestInterceptor_List::TYPE &client_interceptors = this->client_request_interceptors_.interceptors (); @@ -2014,7 +2016,8 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) if (this->ior_interceptor_adapter_ != 0) { - this->ior_interceptor_adapter_->destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); + this->ior_interceptor_adapter_->destroy_interceptors ( + ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } |