From fad4968a88cbfa1f4a7cdc222459f0e742942b78 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Fri, 2 Mar 2001 19:39:10 +0000 Subject: ChangeLogTag:Fri Mar 2 11:37:43 2001 Ossama Othman --- TAO/ChangeLogs/ChangeLog-02a | 8 ++++++++ TAO/tao/PortableInterceptor.cpp | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index bacd534d75e..a5e77f63e5e 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Fri Mar 2 11:37:43 2001 Ossama Othman + + * tao/PortableInterceptor.cpp: + + Moved code within the "TAO_HAS_INTERCEPTORS" block. Fixes a + compile-time error on platforms with request interceptors + disabled. + Fri Mar 02 11:57:03 2001 Angelo Corsaro * tao/Connection_Handler.cpp (set_socket_option): diff --git a/TAO/tao/PortableInterceptor.cpp b/TAO/tao/PortableInterceptor.cpp index dae3c247a40..9f27cd83bf5 100644 --- a/TAO/tao/PortableInterceptor.cpp +++ b/TAO/tao/PortableInterceptor.cpp @@ -3,14 +3,12 @@ #include "tao/corbafwd.h" #include "tao/PortableInterceptor.h" -#if (TAO_HAS_INTERCEPTORS == 1) +#if TAO_HAS_INTERCEPTORS == 1 #if !defined (__ACE_INLINE__) #include "tao/PortableInterceptor.i" #endif /* defined INLINE */ -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - TAO_ClientRequestInterceptor_Adapter:: ~TAO_ClientRequestInterceptor_Adapter (void) { @@ -22,3 +20,5 @@ TAO_ServerRequestInterceptor_Adapter:: ~TAO_ServerRequestInterceptor_Adapter (void) { } + +#endif /* TAO_HAS_INTERCEPTORS == 1 */ -- cgit v1.2.1