diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-28 03:40:04 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-28 03:40:04 +0000 |
| commit | aceac3e8faa484c1dcd07f19eb2f1bafc3f7a751 (patch) | |
| tree | 6a6544b368995669510c3139881318a3d91acfb8 | |
| parent | 3719ac0b5fd192a4be673f213aee7f0350096e37 (diff) | |
| download | ATCD-aceac3e8faa484c1dcd07f19eb2f1bafc3f7a751.tar.gz | |
ChangeLogTag:Thu Apr 27 22:36:48 2000 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/tao/Interceptor.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/Interceptor.h | 3 | ||||
| -rw-r--r-- | TAO/tao/InterceptorC.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/TAOC.h | 2 |
5 files changed, 22 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 666a8fadf4a..b1bff9d9122 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Thu Apr 27 22:36:48 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * tao/TAOC.h: Changed "orbconf.h" to "corbafwd.h". Otherwise, it + won't compile. + + * tao/Interceptor.h: + * tao/Interceptor.cpp: + * tao/InterceptorC.cpp: Made sure we complete disable interceptors + when TAO_HAS_INTERCEPTORS==0 (which is default for minimum + CORBA.) + Thu Apr 27 18:06:53 2000 Carlos O'Ryan <coryan@uci.edu> * tao/ImplRepoC.h: diff --git a/TAO/tao/Interceptor.cpp b/TAO/tao/Interceptor.cpp index e96b68fe98b..04982ef46e6 100644 --- a/TAO/tao/Interceptor.cpp +++ b/TAO/tao/Interceptor.cpp @@ -1,12 +1,17 @@ // $Id$ + #include "tao/corbafwd.h" #include "tao/Interceptor.h" +#if (TAO_HAS_INTERCEPTORS == 1) + #if !defined (__ACE_INLINE__) #include "tao/Interceptor.i" #endif /* defined INLINE */ +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + // Followings are the defualt no-op implementation of client-side and // server-side interceptors. The sole purpose to to let user // overwrite only the interception operations they are interested in diff --git a/TAO/tao/Interceptor.h b/TAO/tao/Interceptor.h index 87b22d9f410..0f7d4f14e30 100644 --- a/TAO/tao/Interceptor.h +++ b/TAO/tao/Interceptor.h @@ -30,7 +30,9 @@ #define TAO_INTERCEPTOR_H #include "ace/pre.h" +#if (TAO_HAS_INTERCEPTORS == 1) #include "tao/InterceptorC.h" +#endif /* TAO_HAS_INTERCEPTORS == 1 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -165,4 +167,5 @@ private: #endif /* defined INLINE */ #include "ace/post.h" + #endif /* TAO_INTERCEPTOR_H */ diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp index 53dc766c3e4..74d2b5af916 100644 --- a/TAO/tao/InterceptorC.cpp +++ b/TAO/tao/InterceptorC.cpp @@ -7,6 +7,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html +#if (TAO_HAS_INTERCEPTORS == 1) #include "InterceptorC.h" #if !defined (__ACE_INLINE__) @@ -402,3 +403,4 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository { return "IDL:TAO/PortableInterceptor/ClientRequestInterceptor:1.0"; } +#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 9f6ba74f825..d92ce81ecc5 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -11,7 +11,7 @@ #define _TAO_IDL_TAOC_H_ #include "ace/pre.h" -#include "tao/orbconf.h" +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once |