diff options
| author | kirthika <kirthika@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-25 22:34:15 +0000 |
|---|---|---|
| committer | kirthika <kirthika@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-25 22:34:15 +0000 |
| commit | 076c625ce512a48f34999c71ca3e3d9345fef4e7 (patch) | |
| tree | 652b3be8838b8c96a88141b41355e31c720aa5aa | |
| parent | dbf9b6ae7bcfdd30f93b8cbae5ce1faf8ddeb2be (diff) | |
| download | ATCD-076c625ce512a48f34999c71ca3e3d9345fef4e7.tar.gz | |
added interceptor check
| -rw-r--r-- | TAO/tao/DynamicC.h | 6 | ||||
| -rw-r--r-- | TAO/tao/PortableInterceptorC.h | 3 | ||||
| -rw-r--r-- | TAO/tao/Request_Info.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Request_Info.h | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h index a05bbefabc1..d5179037676 100644 --- a/TAO/tao/DynamicC.h +++ b/TAO/tao/DynamicC.h @@ -15,8 +15,6 @@ #include "tao/IOPC.h" #include "tao/DynAnyC.h" - - #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) #include "ace/streams.h" #endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ @@ -44,7 +42,7 @@ #endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ - +#if (TAO_HAS_INTERCEPTORS == 1) TAO_NAMESPACE Dynamic { enum ParameterMode @@ -739,6 +737,8 @@ TAO_NAMESPACE_CLOSE // module Dynamic #include "DynamicC.i" #endif /* defined INLINE */ +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index cf23ba672f6..3763d5dee26 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -19,9 +19,10 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - +#if (TAO_HAS_INTERCEPTORS == 1) #include "tao/DynamicC.h" #include "tao/MessagingC.h" +#if (TAO_HAS_INTERCEPTORS == 1) #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/Request_Info.cpp b/TAO/tao/Request_Info.cpp index 0df364aff6a..5679ddeb9cb 100644 --- a/TAO/tao/Request_Info.cpp +++ b/TAO/tao/Request_Info.cpp @@ -22,7 +22,7 @@ #include "tao/corba.h" ACE_RCSID(tao, request_info, "$Id$") - +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequest_Info::TAO_ClientRequest_Info (const char * operation, IOP::ServiceContextList &service_context_list , CORBA::Object * target, @@ -459,3 +459,4 @@ TAO_ServerRequest_Info::request_id (CORBA::ULong request_id) { this->request_id_ = request_id; } +#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/Request_Info.h b/TAO/tao/Request_Info.h index e84d3078ed7..382151b1f37 100644 --- a/TAO/tao/Request_Info.h +++ b/TAO/tao/Request_Info.h @@ -21,6 +21,7 @@ #ifndef REQUEST_INFO_H #define REQUEST_INFO_H +#if (TAO_HAS_INTERCEPTORS == 1) //#include "tao/corbafwd.h" #include "tao/PortableInterceptorC.h" @@ -342,5 +343,5 @@ class TAO_Export TAO_ServerRequest_Info #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ - +#endif /* TAO_HAS_INTERCEPTORS == 1 */ #endif /* REQUEST_INFO_H */ |