diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-28 05:37:38 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-28 05:37:38 +0000 |
| commit | 6a2cb0fa7a84e35b9025224582f29f6e750bf014 (patch) | |
| tree | db1f7499c884b42a211d56dcff3f9a155c4457e9 | |
| parent | 862aa775c0cddc6c3937e40008a2c4f2fd05a442 (diff) | |
| download | ATCD-6a2cb0fa7a84e35b9025224582f29f6e750bf014.tar.gz | |
ChangeLogTag:Mon Mar 27 23:30:26 2000 Nanbor Wang <nanbor@cs.wustl.edu>
84 files changed, 565 insertions, 447 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 23ee79e0196..a0b394f0bd6 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,105 @@ +Mon Mar 27 23:30:26 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * tao/orbconf.h: Changed the following macro definitions to be 0 + or 1 so users can modify the configuration in their config.h + files. + + (TAO_HAS_MINIMUM_CORBA): Default to 0. + + (TAO_HAS_INTERCEPTORS): Default to 1 when + TAO_HAS_MINIMUM_CORBA==0, otherwise, default to 0. + + (TAO_NO_IOR_TABLE): Default to 0 when TAO_HAS_MINIMUM_CORBA==0, + otherwise, for it to 1. + + (POA_NO_TIMESTAMP): Default to 0 + + (TAO_USE_DOTTED_DECIMAL_ADDRESSES): Default to 0. + + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: + * performance-tests/Latency/dii_client.cpp: + * tao/Asynch_Invocation.cpp: + * tao/Asynch_Invocation.h: + * tao/Asynch_Invocation.i: + * tao/Context.cpp: + * tao/Context.h: + * tao/DomainC.cpp: + * tao/DomainC.h: + * tao/DomainC.i: + * tao/DomainS.cpp: + * tao/DomainS_T.i: + * tao/DynAnyC.cpp: + * tao/DynAnyC.h: + * tao/DynAnyS.cpp: + * tao/DynAny_i.cpp: + * tao/DynAny_i.h: + * tao/DynArray_i.cpp: + * tao/DynArray_i.h: + * tao/DynEnum_i.cpp: + * tao/DynEnum_i.h: + * tao/DynSequence_i.cpp: + * tao/DynSequence_i.h: + * tao/DynStruct_i.cpp: + * tao/DynStruct_i.h: + * tao/DynUnion_i.cpp: + * tao/DynUnion_i.h: + * tao/Forwarding_Servant.cpp: + * tao/Forwarding_Servant.h: + * tao/GIOP_Message_Acceptors.cpp: + * tao/GIOP_Message_Lite.cpp: + * tao/GIOP_Server_Request.cpp: + * tao/GIOP_Server_Request.h: + * tao/ImplRepoC.cpp: + * tao/ImplRepoS.cpp: + * tao/InconsistentTypeCodeC.cpp: + * tao/InconsistentTypeCodeC.h: + * tao/Interceptor.cpp: + * tao/Interceptor.h: + * tao/Interceptor.i: + * tao/InterceptorC.cpp: + * tao/InterceptorC.h: + * tao/InterceptorC.i: + * tao/InterceptorS.cpp: + * tao/InterceptorS.h: + * tao/InterfaceS.cpp: + * tao/NVList.cpp: + * tao/NVList.h: + * tao/ORB.cpp: + * tao/ORB.h: + * tao/ORB.i: + * tao/ORB_Core.cpp: + * tao/Object.cpp + * tao/Object.h: + * tao/POA.cpp: + * tao/POA.h: + * tao/POA.i: + * tao/POAC.cpp: + * tao/POAC.h: + * tao/POAC.i: + * tao/POA_CORBA.h: + * tao/Reply_Dispatcher.cpp: + * tao/Reply_Dispatcher.h: + * tao/Reply_Dispatcher.i: + * tao/Request.cpp: + * tao/Request.h: + * tao/Servant_Base.cpp: + * tao/Servant_Base.h: + * tao/Server_Request.h: + * tao/Stub.cpp: + * tao/Stub.h: + * tao/Typecode_Constants.cpp: + * tao/WrongTransactionC.cpp: + * tao/WrongTransactionC.h: + * tao/corbafwd.h: Changed the macro checking statements of + aforementioned macros. + Mon Mar 27 20:37:02 2000 Jeff Parsons <parsons@cs.wustl.edu> * tao/POAC.cpp: @@ -6,7 +108,7 @@ Mon Mar 27 20:37:02 2000 Jeff Parsons <parsons@cs.wustl.edu> working with the new Any operators. The PortableServer::ForwardRequest >>= operator and TAO_GIOP_ServerRequest::set_exception have been changed - to do the right thing. This fixes the failing of + to do the right thing. This fixes the failing of examples/POA/Forwarding on all platforms (except where minimum CORBA is defined). Changing the Any operators for IDL-defined exceptions, and modifying the rest of diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index 3856ab6b9fc..cc2a710114f 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -352,7 +352,7 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node, << ");\n"; // fish out the interceptor from the ORB - *os << "\n#if defined (TAO_HAS_INTERCEPTORS)" << be_nl + *os << "\n#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl << "TAO_ClientRequestInterceptor_Adapter" << be_idt_nl << "_tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV));\n" << be_uidt; @@ -698,7 +698,7 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node, << be_uidt_nl << "}\n"; // Generate exception occurred interceptor code - *os << "#if defined (TAO_HAS_INTERCEPTORS)" << be_nl + *os << "#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl << be_uidt_nl << "}" << be_uidt_nl << "ACE_CATCHANY" << be_idt_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 3c83c5607c1..ebdd76c271b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -181,7 +181,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node) } // Fish out the interceptor and do preinvoke - *os << "#if defined (TAO_HAS_INTERCEPTORS)" << be_nl + *os << "#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl << "TAO_ServerRequestInterceptor_Adapter" << be_idt_nl << "_tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV));" << be_uidt_nl << "ACE_CHECK;" << be_nl @@ -256,7 +256,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node) << "TAO_INTERCEPTOR_CHECK;\n\n"; // do postinvoke, and check for exception. - *os << "#if defined (TAO_HAS_INTERCEPTORS)" << be_nl + *os << "#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl << "_tao_vfr.postinvoke (" << be_idt << be_idt_nl << "_tao_server_request.request_id ()," << be_nl; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 37e84886694..630da52ce99 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -147,7 +147,7 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( return 0; } -#if !defined(TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) return this->supplier_->_non_existent (ACE_TRY_ENV); #else return 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index d9544a8da13..a2de547e409 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -85,7 +85,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( return 0; } -#if !defined(TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) return this->consumer_->_non_existent (ACE_TRY_ENV); #else return 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index f4d04d6c6da..bece33352a2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -48,7 +48,7 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent ( return 0; } -#if !defined(TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) return this->supplier_->_non_existent (ACE_TRY_ENV); #else return 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 0da319b6db1..a168fbb719c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -373,7 +373,7 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( return 0; } -#if !defined(TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) return this->consumer_->_non_existent (ACE_TRY_ENV); #else return 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index 65dbc85a488..f95c0167cf0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -49,7 +49,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( return 0; } -#if !defined(TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) return this->supplier_->_non_existent (ACE_TRY_ENV); #else return 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 1bf0b871f2b..ce60a8797aa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -587,7 +587,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent ( return 0; } -#if !defined(TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) return this->consumer_->_non_existent (ACE_TRY_ENV); #else return 0; diff --git a/TAO/performance-tests/Latency/dii_client.cpp b/TAO/performance-tests/Latency/dii_client.cpp index 05e7194f288..8d9a926c63d 100644 --- a/TAO/performance-tests/Latency/dii_client.cpp +++ b/TAO/performance-tests/Latency/dii_client.cpp @@ -55,7 +55,7 @@ parse_args (int argc, char *argv[]) return 0; } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class DII_Client { @@ -150,7 +150,7 @@ main (int argc, char *argv[]) 1); } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) DII_Client client; client.set (server.in ()); @@ -186,7 +186,7 @@ main (int argc, char *argv[]) // **************************************************************** -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) DII_Client::DII_Client (void) { diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp index 7e655cebd85..4f884f084fa 100644 --- a/TAO/tao/Asynch_Invocation.cpp +++ b/TAO/tao/Asynch_Invocation.cpp @@ -113,7 +113,7 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) //************************************************************************** -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void TAO_GIOP_DII_Deferred_Invocation::start (CORBA::Environment &ACE_TRY_ENV) diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h index 3e7475b2586..1a341f24b6f 100644 --- a/TAO/tao/Asynch_Invocation.h +++ b/TAO/tao/Asynch_Invocation.h @@ -87,7 +87,7 @@ private: //*********************************************************************** -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class TAO_Export TAO_GIOP_DII_Deferred_Invocation : public TAO_GIOP_Invocation { diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i index 53fd1818e42..c36219613ab 100644 --- a/TAO/tao/Asynch_Invocation.i +++ b/TAO/tao/Asynch_Invocation.i @@ -33,7 +33,7 @@ TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub, //**************************************************************************** -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_INLINE TAO_GIOP_DII_Deferred_Invocation:: diff --git a/TAO/tao/Context.cpp b/TAO/tao/Context.cpp index 72b1d3f2d81..3f5510b9ce6 100644 --- a/TAO/tao/Context.cpp +++ b/TAO/tao/Context.cpp @@ -2,7 +2,7 @@ #include "tao/Context.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Typecode.h" #include "tao/Environment.h" diff --git a/TAO/tao/Context.h b/TAO/tao/Context.h index 69c88367296..ff8239362fb 100644 --- a/TAO/tao/Context.h +++ b/TAO/tao/Context.h @@ -27,7 +27,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class TAO_Export CORBA_Context { diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index f1c469b5aa1..886e65e8c88 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -169,7 +169,7 @@ const char* CORBA_DomainManager::_interface_repository_id (void) const return "IDL:omg.org/CORBA/DomainManager:1.0"; } -#if ! defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow ( CORBA::Object_ptr obj, @@ -409,7 +409,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DomainManager_ptr # pragma instantiate TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#if ! defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void CORBA_ConstructionPolicy::_tao_any_destructor (void *x) diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 37d03f81307..fceee5685f4 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -201,7 +201,7 @@ private: // ConstructionPolicy // ************************************************************* -#if ! defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class TAO_Export CORBA_ConstructionPolicy_var { diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i index 719e03e5561..fb6e8f79a43 100644 --- a/TAO/tao/DomainC.i +++ b/TAO/tao/DomainC.i @@ -184,7 +184,7 @@ CORBA_DomainManager_out::operator-> (void) return this->ptr_; } -#if ! defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_INLINE CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (void) // default constructor @@ -600,7 +600,7 @@ operator>> ( return 0; } -#if ! defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp index b4165cd23ed..e74a9af0484 100644 --- a/TAO/tao/DomainS.cpp +++ b/TAO/tao/DomainS.cpp @@ -263,7 +263,7 @@ CORBA::Policy_ptr POA_CORBA::_tao_collocated_DomainManager::get_domain_policy ( ); } -#if ! defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable { diff --git a/TAO/tao/DomainS_T.i b/TAO/tao/DomainS_T.i index efc44a409b9..cb0f9d3128a 100644 --- a/TAO/tao/DomainS_T.i +++ b/TAO/tao/DomainS_T.i @@ -101,7 +101,7 @@ CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy ( #endif /* ACE_HAS_USING_KEYWORD */ -#if ! defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #if defined (ACE_HAS_USING_KEYWORD) template <class T> ACE_INLINE diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp index 4db23a092be..41235fe8c58 100644 --- a/TAO/tao/DynAnyC.cpp +++ b/TAO/tao/DynAnyC.cpp @@ -24,7 +24,7 @@ #include "tao/DynAnyC.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Stub.h" #include "tao/Servant_Base.h" diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h index acce204199f..abed32304ed 100644 --- a/TAO/tao/DynAnyC.h +++ b/TAO/tao/DynAnyC.h @@ -32,7 +32,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/corbafwd.h" #include "tao/Any.h" diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp index d66354c957b..05fb60705b6 100644 --- a/TAO/tao/DynAnyS.cpp +++ b/TAO/tao/DynAnyS.cpp @@ -24,7 +24,7 @@ #include "tao/DynAnyC.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/POA_CORBA.h" #include "tao/Servant_Base.h" diff --git a/TAO/tao/DynAny_i.cpp b/TAO/tao/DynAny_i.cpp index 0df5b4fda22..45dd8c1e749 100644 --- a/TAO/tao/DynAny_i.cpp +++ b/TAO/tao/DynAny_i.cpp @@ -15,7 +15,7 @@ #include "tao/DynAny_i.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/DynStruct_i.h" #include "tao/DynSequence_i.h" diff --git a/TAO/tao/DynAny_i.h b/TAO/tao/DynAny_i.h index b531753d0c2..904fc41c52a 100644 --- a/TAO/tao/DynAny_i.h +++ b/TAO/tao/DynAny_i.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/corbafwd.h" #include "tao/POA_CORBA.h" diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp index 7da431b948d..117aa83bef9 100644 --- a/TAO/tao/DynArray_i.cpp +++ b/TAO/tao/DynArray_i.cpp @@ -16,7 +16,7 @@ #include "tao/DynAny_i.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/DynArray_i.h" #include "tao/InconsistentTypeCodeC.h" diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h index 749d2828402..ac6130384d7 100644 --- a/TAO/tao/DynArray_i.h +++ b/TAO/tao/DynArray_i.h @@ -20,7 +20,7 @@ #include "tao/orbconf.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "ace/Containers.h" diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp index b9fa1fd4e15..60fbad19c2b 100644 --- a/TAO/tao/DynEnum_i.cpp +++ b/TAO/tao/DynEnum_i.cpp @@ -16,7 +16,7 @@ #include "tao/DynAny_i.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/DynEnum_i.h" #include "tao/InconsistentTypeCodeC.h" diff --git a/TAO/tao/DynEnum_i.h b/TAO/tao/DynEnum_i.h index f2bcadfdb09..17ea0e95238 100644 --- a/TAO/tao/DynEnum_i.h +++ b/TAO/tao/DynEnum_i.h @@ -20,7 +20,7 @@ #include "tao/orbconf.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "ace/Containers.h" diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp index baaebc3dd8f..3a4174f2f1d 100644 --- a/TAO/tao/DynSequence_i.cpp +++ b/TAO/tao/DynSequence_i.cpp @@ -16,7 +16,7 @@ #include "tao/DynAny_i.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/DynSequence_i.h" #include "tao/InconsistentTypeCodeC.h" diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h index c60c83e8d5a..a89cdd38888 100644 --- a/TAO/tao/DynSequence_i.h +++ b/TAO/tao/DynSequence_i.h @@ -20,7 +20,7 @@ #include "tao/orbconf.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "ace/Containers.h" diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp index 369797c6345..7f03d01cd0e 100644 --- a/TAO/tao/DynStruct_i.cpp +++ b/TAO/tao/DynStruct_i.cpp @@ -18,7 +18,7 @@ #include "tao/DynAny_i.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/DynStruct_i.h" #include "tao/InconsistentTypeCodeC.h" diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h index a133693affc..0963a611ea2 100644 --- a/TAO/tao/DynStruct_i.h +++ b/TAO/tao/DynStruct_i.h @@ -20,7 +20,7 @@ #include "tao/orbconf.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "ace/Containers.h" diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index f36cf58f7ee..e1c8222cc6f 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -4,7 +4,7 @@ #include "tao/DynAny_i.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/DynUnion_i.h" #include "tao/InconsistentTypeCodeC.h" diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h index 1be5f462a18..9e4b90062f3 100644 --- a/TAO/tao/DynUnion_i.h +++ b/TAO/tao/DynUnion_i.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/DynUnion_i_T.h" diff --git a/TAO/tao/Forwarding_Servant.cpp b/TAO/tao/Forwarding_Servant.cpp index 54f7e33fc33..5b3e828983a 100644 --- a/TAO/tao/Forwarding_Servant.cpp +++ b/TAO/tao/Forwarding_Servant.cpp @@ -2,7 +2,7 @@ #include "tao/Forwarding_Servant.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Object.h" #include "tao/POAC.h" diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h index fc796294652..956772ef7ce 100644 --- a/TAO/tao/Forwarding_Servant.h +++ b/TAO/tao/Forwarding_Servant.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Servant_Base.h" #include "tao/ORB.h" diff --git a/TAO/tao/GIOP_Message_Acceptors.cpp b/TAO/tao/GIOP_Message_Acceptors.cpp index d0d39d1400b..4f57b631f39 100644 --- a/TAO/tao/GIOP_Message_Acceptors.cpp +++ b/TAO/tao/GIOP_Message_Acceptors.cpp @@ -92,7 +92,7 @@ TAO_GIOP_Message_Acceptors:: response_required = request.response_expected (); sync_with_server = request.sync_with_server (); -#if !defined (TAO_NO_IOR_TABLE) +#if (TAO_NO_IOR_TABLE == 0) const CORBA::Octet *object_key = request.object_key ().get_buffer (); @@ -154,7 +154,7 @@ TAO_GIOP_Message_Acceptors:: ); ACE_TRY_CHECK; } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_CATCH (PortableServer::ForwardRequest, forward_request) { // Make the GIOP header and Reply header @@ -315,7 +315,7 @@ TAO_GIOP_Message_Acceptors:: if (parse_error != 0) ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); -#if !defined (TAO_NO_IOR_TABLE) +#if (TAO_NO_IOR_TABLE == 0) const CORBA::Octet *object_key = locate_request.target_address ().object_key ().get_buffer (); @@ -428,7 +428,7 @@ TAO_GIOP_Message_Acceptors:: } } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_CATCH (PortableServer::ForwardRequest, forward_request) { status_info.status = TAO_GIOP_OBJECT_FORWARD; diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index e4d9cd3cc2e..c38e26a3990 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -542,7 +542,7 @@ TAO_GIOP_Message_Lite:: response_required = request.response_expected (); sync_with_server = request.sync_with_server (); -#if !defined (TAO_NO_IOR_TABLE) +#if (TAO_NO_IOR_TABLE == 0) const CORBA::Octet *object_key = request.object_key ().get_buffer (); @@ -603,7 +603,7 @@ TAO_GIOP_Message_Lite:: ); ACE_TRY_CHECK; } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_CATCH (PortableServer::ForwardRequest, forward_request) { // Make the GIOP header and Reply header @@ -765,7 +765,7 @@ TAO_GIOP_Message_Lite:: if (parse_error != 0) ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); -#if !defined (TAO_NO_IOR_TABLE) +#if (TAO_NO_IOR_TABLE == 0) const CORBA::Octet *object_key = locate_request.target_address ().object_key ().get_buffer (); @@ -881,7 +881,7 @@ TAO_GIOP_Message_Lite:: } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_CATCH (PortableServer::ForwardRequest, forward_request) { status_info.status = TAO_GIOP_OBJECT_FORWARD; diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp index 600edbdb8d6..eb60d279140 100644 --- a/TAO/tao/GIOP_Server_Request.cpp +++ b/TAO/tao/GIOP_Server_Request.cpp @@ -57,7 +57,7 @@ TAO_GIOP_ServerRequest:: sync_with_server_ (0), lazy_evaluation_ (0), -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) params_ (0), @@ -97,7 +97,7 @@ TAO_GIOP_ServerRequest:: sync_with_server_ (0), lazy_evaluation_ (0), -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) params_ (0), @@ -119,7 +119,7 @@ TAO_GIOP_ServerRequest:: TAO_GIOP_ServerRequest::~TAO_GIOP_ServerRequest (void) { -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) if (this->params_) CORBA::release (this->params_); @@ -142,7 +142,7 @@ TAO_GIOP_ServerRequest::oa (void) return this->orb_core_->root_poa (); } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // Unmarshal in/inout params, and set up to marshal the appropriate // inout/out/return values later on. @@ -190,7 +190,7 @@ TAO_GIOP_ServerRequest::set_exception (const CORBA::Any &value, else { -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) const PortableServer::ForwardRequest *forward_request = 0; @@ -291,7 +291,7 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) this->mesg_base_->write_protocol_header (TAO_PLUGGABLE_MESSAGE_REPLY, *this->outgoing_); -#if defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 1) *this->outgoing_ << this->service_info_; #else if (this->lazy_evaluation_ == 0 || this->params_ == 0) diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h index f3108887fe4..40083431ff1 100644 --- a/TAO/tao/GIOP_Server_Request.h +++ b/TAO/tao/GIOP_Server_Request.h @@ -61,7 +61,7 @@ public: virtual ~TAO_GIOP_ServerRequest (void); // Destructor. -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // = General ServerRequest operations void arguments (CORBA::NVList_ptr &list, @@ -203,7 +203,7 @@ private: int lazy_evaluation_; // If zero then the NVList is evaluated ASAP. -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::NVList_ptr params_; // Incoming parameters. diff --git a/TAO/tao/ImplRepoC.cpp b/TAO/tao/ImplRepoC.cpp index 42459f1ec92..aa630273896 100644 --- a/TAO/tao/ImplRepoC.cpp +++ b/TAO/tao/ImplRepoC.cpp @@ -83,7 +83,7 @@ void ImplementationRepository::ServerObject::ping ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -150,7 +150,7 @@ void ImplementationRepository::ServerObject::ping ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -194,7 +194,7 @@ void ImplementationRepository::ServerObject::shutdown ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -261,7 +261,7 @@ void ImplementationRepository::ServerObject::shutdown ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -1294,7 +1294,7 @@ void ImplementationRepository::Administration::activate_server ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1366,7 +1366,7 @@ void ImplementationRepository::Administration::activate_server ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -1418,7 +1418,7 @@ void ImplementationRepository::Administration::register_server ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1491,7 +1491,7 @@ void ImplementationRepository::Administration::register_server ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -1537,7 +1537,7 @@ void ImplementationRepository::Administration::reregister_server ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1610,7 +1610,7 @@ void ImplementationRepository::Administration::reregister_server ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -1661,7 +1661,7 @@ void ImplementationRepository::Administration::remove_server ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1733,7 +1733,7 @@ void ImplementationRepository::Administration::remove_server ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -1784,7 +1784,7 @@ void ImplementationRepository::Administration::shutdown_server ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1856,7 +1856,7 @@ void ImplementationRepository::Administration::shutdown_server ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -1909,7 +1909,7 @@ char * ImplementationRepository::Administration::server_is_running ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK_RETURN (0); @@ -1990,7 +1990,7 @@ char * ImplementationRepository::Administration::server_is_running ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -2041,7 +2041,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2113,7 +2113,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -2166,7 +2166,7 @@ void ImplementationRepository::Administration::find ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2242,7 +2242,7 @@ void ImplementationRepository::Administration::find ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -2290,7 +2290,7 @@ void ImplementationRepository::Administration::list ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2367,7 +2367,7 @@ void ImplementationRepository::Administration::list ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -2746,7 +2746,7 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK_RETURN (_tao_retval); @@ -2826,7 +2826,7 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY @@ -2870,7 +2870,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( istub->orb_core () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ClientRequestInterceptor_Adapter _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2937,7 +2937,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( break; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) } ACE_CATCHANY diff --git a/TAO/tao/ImplRepoS.cpp b/TAO/tao/ImplRepoS.cpp index a8233956b48..1627a8afa67 100644 --- a/TAO/tao/ImplRepoS.cpp +++ b/TAO/tao/ImplRepoS.cpp @@ -180,7 +180,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( { POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -217,7 +217,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -259,7 +259,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( { POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -296,7 +296,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -746,7 +746,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -784,7 +784,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -835,7 +835,7 @@ void POA_ImplementationRepository::Administration::register_server_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -874,7 +874,7 @@ void POA_ImplementationRepository::Administration::register_server_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -925,7 +925,7 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -964,7 +964,7 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1013,7 +1013,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1051,7 +1051,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1100,7 +1100,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1138,7 +1138,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1192,7 +1192,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1232,7 +1232,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1287,7 +1287,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1325,7 +1325,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1375,7 +1375,7 @@ void POA_ImplementationRepository::Administration::find_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1414,7 +1414,7 @@ void POA_ImplementationRepository::Administration::find_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1471,7 +1471,7 @@ void POA_ImplementationRepository::Administration::list_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1511,7 +1511,7 @@ void POA_ImplementationRepository::Administration::list_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -2185,7 +2185,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2224,7 +2224,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -2273,7 +2273,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( { POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2310,7 +2310,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, diff --git a/TAO/tao/InconsistentTypeCodeC.cpp b/TAO/tao/InconsistentTypeCodeC.cpp index c751a1fffb2..8e67ac4ac0d 100644 --- a/TAO/tao/InconsistentTypeCodeC.cpp +++ b/TAO/tao/InconsistentTypeCodeC.cpp @@ -24,7 +24,7 @@ #include "tao/InconsistentTypeCodeC.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/ORB.h" diff --git a/TAO/tao/InconsistentTypeCodeC.h b/TAO/tao/InconsistentTypeCodeC.h index 2c206a025c9..7cb069d3ee5 100644 --- a/TAO/tao/InconsistentTypeCodeC.h +++ b/TAO/tao/InconsistentTypeCodeC.h @@ -32,7 +32,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Exception.h" diff --git a/TAO/tao/Interceptor.cpp b/TAO/tao/Interceptor.cpp index 833ace63368..c5c4ede75f4 100644 --- a/TAO/tao/Interceptor.cpp +++ b/TAO/tao/Interceptor.cpp @@ -19,7 +19,7 @@ // return CORBA::string_dup ("TAO default"); // } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) void POA_PortableInterceptor:: ServerRequestInterceptor::preinvoke (CORBA::ULong, CORBA::Boolean, diff --git a/TAO/tao/Interceptor.h b/TAO/tao/Interceptor.h index bdf4c615be3..2d98002c4af 100644 --- a/TAO/tao/Interceptor.h +++ b/TAO/tao/Interceptor.h @@ -36,7 +36,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) # define TAO_INTERCEPTOR(X) X # define TAO_INTERCEPTOR_CHECK ACE_TRY_CHECK # define TAO_INTERCEPTOR_CHECK_RETURN(X) ACE_TRY_CHECK @@ -50,7 +50,7 @@ # define TAO_INTERCEPTOR_THROW_RETURN(X,Y) ACE_THROW_RETURN(X,Y) #endif /* TAO_HAS_INTERCEPTORS */ -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) class TAO_Export TAO_ClientRequestInterceptor_Adapter { // = TITLE diff --git a/TAO/tao/Interceptor.i b/TAO/tao/Interceptor.i index 91ba9edffeb..dbc30782d0b 100644 --- a/TAO/tao/Interceptor.i +++ b/TAO/tao/Interceptor.i @@ -1,6 +1,6 @@ /* -*- C++ -*- $Id$ */ -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) ACE_INLINE TAO_ClientRequestInterceptor_Adapter::TAO_ClientRequestInterceptor_Adapter (PortableInterceptor::ClientRequestInterceptor_ptr interceptor) diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp index 8f6c69e5fd2..f21e108bca5 100644 --- a/TAO/tao/InterceptorC.cpp +++ b/TAO/tao/InterceptorC.cpp @@ -14,7 +14,7 @@ #include "tao/InterceptorC.i" #endif /* !defined INLINE */ -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) PortableInterceptor::Cookie_ptr PortableInterceptor::Cookie::_narrow ( CORBA::Object_ptr obj, diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h index c844183ec1e..9eecd93f3f3 100644 --- a/TAO/tao/InterceptorC.h +++ b/TAO/tao/InterceptorC.h @@ -36,7 +36,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_NAMESPACE PortableInterceptor { diff --git a/TAO/tao/InterceptorC.i b/TAO/tao/InterceptorC.i index 96fbd45bf5d..aef730efe56 100644 --- a/TAO/tao/InterceptorC.i +++ b/TAO/tao/InterceptorC.i @@ -7,7 +7,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) ACE_INLINE PortableInterceptor::Cookie::Cookie (void) // default constructor diff --git a/TAO/tao/InterceptorS.cpp b/TAO/tao/InterceptorS.cpp index 2b0e143b5cf..48669087d7b 100644 --- a/TAO/tao/InterceptorS.cpp +++ b/TAO/tao/InterceptorS.cpp @@ -9,7 +9,7 @@ #include "tao/InterceptorS.h" -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) // skeleton constructor POA_PortableInterceptor::Cookie::Cookie (void) diff --git a/TAO/tao/InterceptorS.h b/TAO/tao/InterceptorS.h index 9726ef46bda..dc56114fb22 100644 --- a/TAO/tao/InterceptorS.h +++ b/TAO/tao/InterceptorS.h @@ -25,7 +25,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_NAMESPACE POA_PortableInterceptor { diff --git a/TAO/tao/InterfaceS.cpp b/TAO/tao/InterfaceS.cpp index 6a2e1356a7e..95db47905ec 100644 --- a/TAO/tao/InterfaceS.cpp +++ b/TAO/tao/InterfaceS.cpp @@ -186,7 +186,7 @@ void POA_CORBA::IRObject::_get_def_kind_skel ( POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *)_tao_object_reference; CORBA::DefinitionKind _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -223,7 +223,7 @@ void POA_CORBA::IRObject::_get_def_kind_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -271,7 +271,7 @@ void POA_CORBA::IRObject::destroy_skel ( { POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *)_tao_object_reference; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -308,7 +308,7 @@ void POA_CORBA::IRObject::destroy_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -773,7 +773,7 @@ void POA_CORBA::Contained::_get_id_skel ( POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference; CORBA::String_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -810,7 +810,7 @@ void POA_CORBA::Contained::_get_id_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -865,7 +865,7 @@ void POA_CORBA::Contained::_set_id_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -903,7 +903,7 @@ void POA_CORBA::Contained::_set_id_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -946,7 +946,7 @@ void POA_CORBA::Contained::_get_name_skel ( POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference; CORBA::String_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -983,7 +983,7 @@ void POA_CORBA::Contained::_get_name_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1038,7 +1038,7 @@ void POA_CORBA::Contained::_set_name_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1076,7 +1076,7 @@ void POA_CORBA::Contained::_set_name_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1119,7 +1119,7 @@ void POA_CORBA::Contained::_get_version_skel ( POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference; CORBA::String_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1156,7 +1156,7 @@ void POA_CORBA::Contained::_get_version_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1211,7 +1211,7 @@ void POA_CORBA::Contained::_set_version_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1249,7 +1249,7 @@ void POA_CORBA::Contained::_set_version_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1292,7 +1292,7 @@ void POA_CORBA::Contained::_get_defined_in_skel ( POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference; CORBA::Container_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1329,7 +1329,7 @@ void POA_CORBA::Contained::_get_defined_in_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1378,7 +1378,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel ( POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference; CORBA::String_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1415,7 +1415,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1464,7 +1464,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel ( POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference; CORBA::Repository_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1501,7 +1501,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1550,7 +1550,7 @@ void POA_CORBA::Contained::describe_skel ( POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference; CORBA::Contained::Description_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1587,7 +1587,7 @@ void POA_CORBA::Contained::describe_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -1646,7 +1646,7 @@ void POA_CORBA::Contained::move_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -1686,7 +1686,7 @@ void POA_CORBA::Contained::move_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -2414,7 +2414,7 @@ void POA_CORBA::Container::lookup_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2452,7 +2452,7 @@ void POA_CORBA::Container::lookup_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -2510,7 +2510,7 @@ void POA_CORBA::Container::contents_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2549,7 +2549,7 @@ void POA_CORBA::Container::contents_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -2611,7 +2611,7 @@ void POA_CORBA::Container::lookup_name_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2652,7 +2652,7 @@ void POA_CORBA::Container::lookup_name_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -2712,7 +2712,7 @@ void POA_CORBA::Container::describe_contents_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2752,7 +2752,7 @@ void POA_CORBA::Container::describe_contents_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -2812,7 +2812,7 @@ void POA_CORBA::Container::create_module_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2852,7 +2852,7 @@ void POA_CORBA::Container::create_module_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -2916,7 +2916,7 @@ void POA_CORBA::Container::create_constant_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -2958,7 +2958,7 @@ void POA_CORBA::Container::create_constant_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -3020,7 +3020,7 @@ void POA_CORBA::Container::create_struct_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -3061,7 +3061,7 @@ void POA_CORBA::Container::create_struct_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -3125,7 +3125,7 @@ void POA_CORBA::Container::create_union_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -3167,7 +3167,7 @@ void POA_CORBA::Container::create_union_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -3229,7 +3229,7 @@ void POA_CORBA::Container::create_enum_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -3270,7 +3270,7 @@ void POA_CORBA::Container::create_enum_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -3332,7 +3332,7 @@ void POA_CORBA::Container::create_alias_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -3373,7 +3373,7 @@ void POA_CORBA::Container::create_alias_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -3435,7 +3435,7 @@ void POA_CORBA::Container::create_interface_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -3476,7 +3476,7 @@ void POA_CORBA::Container::create_interface_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -3550,7 +3550,7 @@ void POA_CORBA::Container::create_value_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -3597,7 +3597,7 @@ void POA_CORBA::Container::create_value_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -3659,7 +3659,7 @@ void POA_CORBA::Container::create_value_box_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -3700,7 +3700,7 @@ void POA_CORBA::Container::create_value_box_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -3762,7 +3762,7 @@ void POA_CORBA::Container::create_exception_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -3803,7 +3803,7 @@ void POA_CORBA::Container::create_exception_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -4712,7 +4712,7 @@ void POA_CORBA::IDLType::_get_type_skel ( POA_CORBA::IDLType *_tao_impl = (POA_CORBA::IDLType *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -4749,7 +4749,7 @@ void POA_CORBA::IDLType::_get_type_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -5204,7 +5204,7 @@ void POA_CORBA::Repository::lookup_id_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -5242,7 +5242,7 @@ void POA_CORBA::Repository::lookup_id_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -5298,7 +5298,7 @@ void POA_CORBA::Repository::get_primitive_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -5336,7 +5336,7 @@ void POA_CORBA::Repository::get_primitive_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -5392,7 +5392,7 @@ void POA_CORBA::Repository::create_string_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -5430,7 +5430,7 @@ void POA_CORBA::Repository::create_string_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -5486,7 +5486,7 @@ void POA_CORBA::Repository::create_wstring_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -5524,7 +5524,7 @@ void POA_CORBA::Repository::create_wstring_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -5582,7 +5582,7 @@ void POA_CORBA::Repository::create_sequence_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -5621,7 +5621,7 @@ void POA_CORBA::Repository::create_sequence_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -5679,7 +5679,7 @@ void POA_CORBA::Repository::create_array_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -5718,7 +5718,7 @@ void POA_CORBA::Repository::create_array_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -5776,7 +5776,7 @@ void POA_CORBA::Repository::create_fixed_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -5815,7 +5815,7 @@ void POA_CORBA::Repository::create_fixed_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -6863,7 +6863,7 @@ void POA_CORBA::ConstantDef::_get_type_skel ( POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -6900,7 +6900,7 @@ void POA_CORBA::ConstantDef::_get_type_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -6949,7 +6949,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel ( POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -6986,7 +6986,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -7041,7 +7041,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -7079,7 +7079,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -7122,7 +7122,7 @@ void POA_CORBA::ConstantDef::_get_value_skel ( POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *)_tao_object_reference; CORBA::Any_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -7159,7 +7159,7 @@ void POA_CORBA::ConstantDef::_get_value_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -7214,7 +7214,7 @@ void POA_CORBA::ConstantDef::_set_value_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -7252,7 +7252,7 @@ void POA_CORBA::ConstantDef::_set_value_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -8218,7 +8218,7 @@ void POA_CORBA::StructDef::_get_members_skel ( POA_CORBA::StructDef *_tao_impl = (POA_CORBA::StructDef *)_tao_object_reference; CORBA::StructMemberSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -8255,7 +8255,7 @@ void POA_CORBA::StructDef::_get_members_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -8310,7 +8310,7 @@ void POA_CORBA::StructDef::_set_members_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -8348,7 +8348,7 @@ void POA_CORBA::StructDef::_set_members_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -8861,7 +8861,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel ( POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -8898,7 +8898,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -8947,7 +8947,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel ( POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -8984,7 +8984,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -9039,7 +9039,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -9077,7 +9077,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -9120,7 +9120,7 @@ void POA_CORBA::UnionDef::_get_members_skel ( POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *)_tao_object_reference; CORBA::UnionMemberSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -9157,7 +9157,7 @@ void POA_CORBA::UnionDef::_get_members_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -9212,7 +9212,7 @@ void POA_CORBA::UnionDef::_set_members_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -9250,7 +9250,7 @@ void POA_CORBA::UnionDef::_set_members_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -9830,7 +9830,7 @@ void POA_CORBA::EnumDef::_get_members_skel ( POA_CORBA::EnumDef *_tao_impl = (POA_CORBA::EnumDef *)_tao_object_reference; CORBA::EnumMemberSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -9867,7 +9867,7 @@ void POA_CORBA::EnumDef::_get_members_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -9922,7 +9922,7 @@ void POA_CORBA::EnumDef::_set_members_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -9960,7 +9960,7 @@ void POA_CORBA::EnumDef::_set_members_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -10449,7 +10449,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel ( POA_CORBA::AliasDef *_tao_impl = (POA_CORBA::AliasDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -10486,7 +10486,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -10541,7 +10541,7 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -10579,7 +10579,7 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -11034,7 +11034,7 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel ( POA_CORBA::PrimitiveDef *_tao_impl = (POA_CORBA::PrimitiveDef *)_tao_object_reference; CORBA::PrimitiveKind _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -11071,7 +11071,7 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -11515,7 +11515,7 @@ void POA_CORBA::StringDef::_get_bound_skel ( POA_CORBA::StringDef *_tao_impl = (POA_CORBA::StringDef *)_tao_object_reference; CORBA::ULong _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -11552,7 +11552,7 @@ void POA_CORBA::StringDef::_get_bound_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -11607,7 +11607,7 @@ void POA_CORBA::StringDef::_set_bound_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -11645,7 +11645,7 @@ void POA_CORBA::StringDef::_set_bound_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -12112,7 +12112,7 @@ void POA_CORBA::WstringDef::_get_bound_skel ( POA_CORBA::WstringDef *_tao_impl = (POA_CORBA::WstringDef *)_tao_object_reference; CORBA::ULong _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -12149,7 +12149,7 @@ void POA_CORBA::WstringDef::_get_bound_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -12204,7 +12204,7 @@ void POA_CORBA::WstringDef::_set_bound_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -12242,7 +12242,7 @@ void POA_CORBA::WstringDef::_set_bound_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -12711,7 +12711,7 @@ void POA_CORBA::FixedDef::_get_digits_skel ( POA_CORBA::FixedDef *_tao_impl = (POA_CORBA::FixedDef *)_tao_object_reference; CORBA::UShort _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -12748,7 +12748,7 @@ void POA_CORBA::FixedDef::_get_digits_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -12803,7 +12803,7 @@ void POA_CORBA::FixedDef::_set_digits_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -12841,7 +12841,7 @@ void POA_CORBA::FixedDef::_set_digits_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -12884,7 +12884,7 @@ void POA_CORBA::FixedDef::_get_scale_skel ( POA_CORBA::FixedDef *_tao_impl = (POA_CORBA::FixedDef *)_tao_object_reference; CORBA::Short _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -12921,7 +12921,7 @@ void POA_CORBA::FixedDef::_get_scale_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -12976,7 +12976,7 @@ void POA_CORBA::FixedDef::_set_scale_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -13014,7 +13014,7 @@ void POA_CORBA::FixedDef::_set_scale_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -13542,7 +13542,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel ( POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *)_tao_object_reference; CORBA::ULong _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -13579,7 +13579,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -13634,7 +13634,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -13672,7 +13672,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -13715,7 +13715,7 @@ void POA_CORBA::SequenceDef::_get_element_type_skel ( POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -13752,7 +13752,7 @@ void POA_CORBA::SequenceDef::_get_element_type_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -13801,7 +13801,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel ( POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -13838,7 +13838,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -13893,7 +13893,7 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -13931,7 +13931,7 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -14488,7 +14488,7 @@ void POA_CORBA::ArrayDef::_get_length_skel ( POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *)_tao_object_reference; CORBA::ULong _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -14525,7 +14525,7 @@ void POA_CORBA::ArrayDef::_get_length_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -14580,7 +14580,7 @@ void POA_CORBA::ArrayDef::_set_length_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -14618,7 +14618,7 @@ void POA_CORBA::ArrayDef::_set_length_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -14661,7 +14661,7 @@ void POA_CORBA::ArrayDef::_get_element_type_skel ( POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -14698,7 +14698,7 @@ void POA_CORBA::ArrayDef::_get_element_type_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -14747,7 +14747,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel ( POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -14784,7 +14784,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -14839,7 +14839,7 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -14877,7 +14877,7 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -15459,7 +15459,7 @@ void POA_CORBA::ExceptionDef::_get_type_skel ( POA_CORBA::ExceptionDef *_tao_impl = (POA_CORBA::ExceptionDef *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -15496,7 +15496,7 @@ void POA_CORBA::ExceptionDef::_get_type_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -15545,7 +15545,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel ( POA_CORBA::ExceptionDef *_tao_impl = (POA_CORBA::ExceptionDef *)_tao_object_reference; CORBA::StructMemberSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -15582,7 +15582,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -15637,7 +15637,7 @@ void POA_CORBA::ExceptionDef::_set_members_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -15675,7 +15675,7 @@ void POA_CORBA::ExceptionDef::_set_members_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -16189,7 +16189,7 @@ void POA_CORBA::AttributeDef::_get_type_skel ( POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -16226,7 +16226,7 @@ void POA_CORBA::AttributeDef::_get_type_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -16275,7 +16275,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel ( POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -16312,7 +16312,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -16367,7 +16367,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -16405,7 +16405,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -16448,7 +16448,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel ( POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *)_tao_object_reference; CORBA::AttributeMode _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -16485,7 +16485,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -16540,7 +16540,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -16578,7 +16578,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17201,7 +17201,7 @@ void POA_CORBA::OperationDef::_get_result_skel ( POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17238,7 +17238,7 @@ void POA_CORBA::OperationDef::_get_result_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17287,7 +17287,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel ( POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17324,7 +17324,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17379,7 +17379,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17417,7 +17417,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17460,7 +17460,7 @@ void POA_CORBA::OperationDef::_get_params_skel ( POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference; CORBA::ParDescriptionSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17497,7 +17497,7 @@ void POA_CORBA::OperationDef::_get_params_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17552,7 +17552,7 @@ void POA_CORBA::OperationDef::_set_params_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17590,7 +17590,7 @@ void POA_CORBA::OperationDef::_set_params_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17633,7 +17633,7 @@ void POA_CORBA::OperationDef::_get_mode_skel ( POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference; CORBA::OperationMode _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17670,7 +17670,7 @@ void POA_CORBA::OperationDef::_get_mode_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17725,7 +17725,7 @@ void POA_CORBA::OperationDef::_set_mode_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17763,7 +17763,7 @@ void POA_CORBA::OperationDef::_set_mode_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17806,7 +17806,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel ( POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference; CORBA::ContextIdSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17843,7 +17843,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17898,7 +17898,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -17936,7 +17936,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -17979,7 +17979,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel ( POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference; CORBA::ExceptionDefSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -18016,7 +18016,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -18071,7 +18071,7 @@ void POA_CORBA::OperationDef::_set_exceptions_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -18109,7 +18109,7 @@ void POA_CORBA::OperationDef::_set_exceptions_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -18872,7 +18872,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel ( POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *)_tao_object_reference; CORBA::InterfaceDefSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -18909,7 +18909,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -18964,7 +18964,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -19002,7 +19002,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -19052,7 +19052,7 @@ void POA_CORBA::InterfaceDef::is_a_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -19090,7 +19090,7 @@ void POA_CORBA::InterfaceDef::is_a_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -19139,7 +19139,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel ( POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *)_tao_object_reference; CORBA::InterfaceDef::FullInterfaceDescription_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -19176,7 +19176,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -19240,7 +19240,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -19282,7 +19282,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -19352,7 +19352,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -19397,7 +19397,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -20036,7 +20036,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel ( POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *)_tao_object_reference; CORBA::TypeCode_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -20073,7 +20073,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -20122,7 +20122,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel ( POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -20159,7 +20159,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -20214,7 +20214,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -20252,7 +20252,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -20295,7 +20295,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel ( POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *)_tao_object_reference; CORBA::Visibility _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -20332,7 +20332,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -20387,7 +20387,7 @@ void POA_CORBA::ValueMemberDef::_set_access_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -20425,7 +20425,7 @@ void POA_CORBA::ValueMemberDef::_set_access_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21028,7 +21028,7 @@ void POA_CORBA::ValueDef::_get_supported_interface_skel ( POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference; CORBA::InterfaceDef_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21065,7 +21065,7 @@ void POA_CORBA::ValueDef::_get_supported_interface_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21120,7 +21120,7 @@ void POA_CORBA::ValueDef::_set_supported_interface_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21158,7 +21158,7 @@ void POA_CORBA::ValueDef::_set_supported_interface_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21201,7 +21201,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel ( POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference; CORBA::InitializerSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21238,7 +21238,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21293,7 +21293,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21331,7 +21331,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21374,7 +21374,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel ( POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference; CORBA::ValueDef_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21411,7 +21411,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21466,7 +21466,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21504,7 +21504,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21547,7 +21547,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel ( POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference; CORBA::ValueDefSeq_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21584,7 +21584,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21639,7 +21639,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21677,7 +21677,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21720,7 +21720,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel ( POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference; CORBA::Boolean _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21757,7 +21757,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21812,7 +21812,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21850,7 +21850,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21893,7 +21893,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel ( POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference; CORBA::Boolean _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -21930,7 +21930,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -21985,7 +21985,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -22023,7 +22023,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -22066,7 +22066,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel ( POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference; CORBA::Boolean _tao_retval = 0; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -22103,7 +22103,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -22158,7 +22158,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -22196,7 +22196,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -22246,7 +22246,7 @@ void POA_CORBA::ValueDef::is_a_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -22284,7 +22284,7 @@ void POA_CORBA::ValueDef::is_a_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -22333,7 +22333,7 @@ void POA_CORBA::ValueDef::describe_value_skel ( POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference; CORBA::ValueDef::FullValueDescription_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -22370,7 +22370,7 @@ void POA_CORBA::ValueDef::describe_value_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -22434,7 +22434,7 @@ void POA_CORBA::ValueDef::create_value_member_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -22476,7 +22476,7 @@ void POA_CORBA::ValueDef::create_value_member_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -22540,7 +22540,7 @@ void POA_CORBA::ValueDef::create_attribute_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -22582,7 +22582,7 @@ void POA_CORBA::ValueDef::create_attribute_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -22652,7 +22652,7 @@ void POA_CORBA::ValueDef::create_operation_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -22697,7 +22697,7 @@ void POA_CORBA::ValueDef::create_operation_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -23709,7 +23709,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel ( POA_CORBA::ValueBoxDef *_tao_impl = (POA_CORBA::ValueBoxDef *)_tao_object_reference; CORBA::IDLType_var _tao_retval; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -23746,7 +23746,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, @@ -23801,7 +23801,7 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel ( )) ACE_THROW (CORBA::MARSHAL () ); -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) TAO_ServerRequestInterceptor_Adapter _tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV)); ACE_CHECK; @@ -23839,7 +23839,7 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel ( TAO_INTERCEPTOR_CHECK; -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) _tao_vfr.postinvoke ( _tao_server_request.request_id (), 1, diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index adbdc22bed2..b6b3f44d406 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -4,7 +4,7 @@ #include "tao/NVList.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Exception.h" #include "tao/Environment.h" diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index 44d013ddb5d..74169059915 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "ace/Containers_T.h" #include "tao/Any.h" diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 47aac74ee66..f5bfbee44c9 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -162,7 +162,7 @@ CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core) # if defined (TAO_HAS_VALUETYPE) valuetype_factory_map_ (0), # endif /* TAO_HAS_VALUETYPE */ -# if defined (TAO_HAS_INTERCEPTORS) +# if (TAO_HAS_INTERCEPTORS == 1) client_interceptor_ (), server_interceptor_ (), # endif /* TAO_HAS_INTERCEPTORS */ @@ -291,7 +291,7 @@ CORBA_ORB::work_pending (CORBA_Environment &ACE_TRY_ENV) return 1; } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void CORBA_ORB::create_list (CORBA::Long count, @@ -973,7 +973,7 @@ CORBA_ORB::check_shutdown (CORBA_Environment &ACE_TRY_ENV) } } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // Dynamic Any factory functions. diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 53e08541bd4..0b86fd31c0a 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -379,7 +379,7 @@ public: TAO_default_environment () ); #endif /* TAO_HAS_VALUETYPE */ -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) // = Interceptor registration routine // Currently, we only support one interceptor per-ORB. @@ -404,7 +404,7 @@ public: // accessor to the server-side interceptor. You get a duplicate. #endif /* TAO_HAS_INTERCEPTORS */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // Typedefs for CORBA_ORB_RequestSeq, // which is an argument of send_multiple_requests_*(). @@ -803,7 +803,7 @@ private: // If non-0 then this is the Factory for OBV unmarshaling #endif /* TAO_HAS_VALUETYPE */ -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) PortableInterceptor::ClientRequestInterceptor_var client_interceptor_; PortableInterceptor::ServerRequestInterceptor_var server_interceptor_; // Interceptor registries. diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i index 2ad8378dba2..541b2e264d7 100644 --- a/TAO/tao/ORB.i +++ b/TAO/tao/ORB.i @@ -309,7 +309,7 @@ CORBA_ORB::orb_core (void) const return this->orb_core_; } -#if defined (TAO_HAS_INTERCEPTORS) +#if (TAO_HAS_INTERCEPTORS == 1) ACE_INLINE PortableInterceptor::ClientRequestInterceptor_ptr CORBA_ORB::_register_client_interceptor (PortableInterceptor::ClientRequestInterceptor_ptr ci, diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index da3ef635be9..789ee067bdb 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -279,7 +279,7 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // @@ This option will be treated as a suggestion to each loaded // protocol to use a character representation for the numeric // address, otherwise use a logical name. fredk -#if defined (TAO_USE_DOTTED_DECIMAL_ADDRESSES) +#if (TAO_USE_DOTTED_DECIMAL_ADDRESSES == 1) int dotted_decimal_addresses = 1; #else int dotted_decimal_addresses = 0; diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 542705025d3..5bd3372df1e 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -248,7 +248,7 @@ CORBA::Object::_use_locate_requests (CORBA::Boolean use_it) return; } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // NON_EXISTENT ... send a simple call to the object, which will // either elicit a FALSE response or a OBJECT_NOT_EXIST exception. In @@ -566,7 +566,7 @@ CORBA_Object::_validate_connection (CORBA::PolicyList_out inconsistent_policies, { inconsistent_policies = 0; -#if defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 1) ACE_UNUSED_ARG (ACE_TRY_ENV); diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 938b6dc791f..0bf684025b0 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -79,7 +79,7 @@ public: virtual CORBA::Boolean _is_collocated (void) const; // are we collocated with the servant? -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp index 4817ca2033c..83c04f0343e 100644 --- a/TAO/tao/POA.cpp +++ b/TAO/tao/POA.cpp @@ -14,7 +14,7 @@ // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) # include "tao/ImplRepoC.h" # include "tao/ImplRepoS.h" # include "tao/Acceptor_Registry.h" @@ -24,7 +24,7 @@ // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -79,7 +79,7 @@ private: ACE_RCSID(tao, POA, "$Id$") -#if !defined (TAO_NO_IOR_TABLE) +#if (TAO_NO_IOR_TABLE == 0) // This is the TAO_Object_key-prefix that is appended to all TAO Object keys. // It's an array of octets representing ^t^a^o/0 in octal. CORBA::Octet @@ -117,7 +117,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) server_object_ (0), use_imr_ (1), @@ -187,7 +187,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name, // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) if (this->policies_.lifespan () == PortableServer::PERSISTENT) { int temp = this->use_imr_; @@ -507,7 +507,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) if (this->policies_.lifespan () == PortableServer::PERSISTENT) { this->imr_notify_shutdown (); @@ -1791,7 +1791,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id, // // Forwarding related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void TAO_POA::forward_object_i (const PortableServer::ObjectId &oid, @@ -2189,7 +2189,7 @@ TAO_POA::parse_key (const TAO_ObjectKey &key, // Get the object key octets. const CORBA::Octet *key_data = key.get_buffer (); -#if !defined (TAO_NO_IOR_TABLE) +#if (TAO_NO_IOR_TABLE == 0) // Skip the object key prefix since we have already checked for // this. starting_at += TAO_OBJECTKEY_PREFIX_SIZE; @@ -2252,7 +2252,7 @@ TAO_POA::parse_key (const TAO_ObjectKey &key, // Skip past the persistent indicator starting_at += TAO_POA::persistent_key_type_length (); -#if !defined (POA_NO_TIMESTAMP) +#if (POA_NO_TIMESTAMP == 0) // Grab the timestamp for transient POAs. if (!is_persistent) { @@ -2318,7 +2318,7 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) { // Calculate the prefix size. CORBA::ULong prefix_size = 0; -#if !defined (TAO_NO_IOR_TABLE) +#if (TAO_NO_IOR_TABLE == 0) prefix_size += TAO_OBJECTKEY_PREFIX_SIZE; #endif /* TAO_NO_IOR_TABLE */ @@ -2349,7 +2349,7 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) // Calculate the space required for the timestamp and the persistent // byte. CORBA::ULong creation_time = this->persistent_key_type_length (); -#if !defined (POA_NO_TIMESTAMP) +#if (POA_NO_TIMESTAMP == 0) // Calculate the space required for the timestamp. CORBA::ULong creation_time_length = TAO_Creation_Time::creation_time_length (); if (!this->persistent_) @@ -2373,7 +2373,7 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) // Keeps track of where the next infomation goes; start at 0 byte. CORBA::ULong starting_at = 0; -#if !defined (TAO_NO_IOR_TABLE) +#if (TAO_NO_IOR_TABLE == 0) // Add the object key prefix. ACE_OS::memcpy (&buffer[starting_at], &objectkey_prefix[0], @@ -2394,7 +2394,7 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) buffer[starting_at] = (CORBA::Octet) this->persistent_key_type (); starting_at += this->persistent_key_type_length (); -#if !defined (POA_NO_TIMESTAMP) +#if (POA_NO_TIMESTAMP == 0) // Then copy the timestamp for transient POAs. if (!this->persistent ()) { @@ -3609,7 +3609,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key, // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) if (this->use_imr_ && this->policies_.lifespan () == PortableServer::PERSISTENT) @@ -3682,7 +3682,7 @@ orbkey: // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV) @@ -3807,7 +3807,7 @@ template class ACE_Array_Base<PortableServer::ObjectId>; // // Forwarding related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) template class ACE_Auto_Basic_Ptr<TAO_Forwarding_Servant>; template class auto_ptr<TAO_Forwarding_Servant>; @@ -3849,7 +3849,7 @@ template class ACE_Node<TAO_POA *>; // // Forwarding related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Forwarding_Servant> #pragma instantiate auto_ptr<TAO_Forwarding_Servant> diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h index e07f294c736..cb1bc59ca19 100644 --- a/TAO/tao/POA.h +++ b/TAO/tao/POA.h @@ -49,7 +49,7 @@ // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // Implementation Repository # include "tao/ImplRepoC.h" #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -463,7 +463,7 @@ public: // // Forwarding related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void forward_object (const PortableServer::ObjectId &oid, CORBA::Object_ptr forward_to, @@ -559,7 +559,7 @@ protected: // // ImplRepo related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void imr_notify_startup (CORBA_Environment &ACE_TRY_ENV); // ImplRepo helper method, notify the ImplRepo on startup @@ -631,7 +631,7 @@ protected: // // Forwarding related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void forward_object_i (const PortableServer::ObjectId &oid, CORBA::Object_ptr forward_to, @@ -744,7 +744,7 @@ protected: #endif /* TAO_HAS_MINIMUM_POA == 0 */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ServerObject_i *server_object_; // Implementation Repository Server Object diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i index 58f279abb31..437b963d3b5 100644 --- a/TAO/tao/POA.i +++ b/TAO/tao/POA.i @@ -129,7 +129,7 @@ TAO_Creation_Time::creation_time (void) const ACE_INLINE int TAO_Creation_Time::operator== (const TAO_Creation_Time &rhs) const { -#if defined (POA_NO_TIMESTAMP) +#if (POA_NO_TIMESTAMP == 1) ACE_UNUSED_ARG (rhs); return 1; #else @@ -142,7 +142,7 @@ TAO_Creation_Time::operator== (const TAO_Creation_Time &rhs) const ACE_INLINE int TAO_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const { -#if defined (POA_NO_TIMESTAMP) +#if (POA_NO_TIMESTAMP == 1) ACE_UNUSED_ARG (rhs); return 0; #else @@ -155,7 +155,7 @@ TAO_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const ACE_INLINE int TAO_Temporary_Creation_Time::operator== (const TAO_Creation_Time &rhs) const { -#if defined (POA_NO_TIMESTAMP) +#if (POA_NO_TIMESTAMP == 1) ACE_UNUSED_ARG (rhs); return 1; #else @@ -168,7 +168,7 @@ TAO_Temporary_Creation_Time::operator== (const TAO_Creation_Time &rhs) const ACE_INLINE int TAO_Temporary_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const { -#if defined (POA_NO_TIMESTAMP) +#if (POA_NO_TIMESTAMP == 1) ACE_UNUSED_ARG (rhs); return 0; #else @@ -399,7 +399,7 @@ TAO_POA::id_to_reference (const PortableServer::ObjectId &oid, // // Forwarding related. // -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_INLINE void TAO_POA::forward_object (const PortableServer::ObjectId &oid, diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp index 635ddee7d34..e4530ef3760 100644 --- a/TAO/tao/POAC.cpp +++ b/TAO/tao/POAC.cpp @@ -66,7 +66,7 @@ TAO_NAMESPACE_BEGIN (PortableServer) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId) TAO_NAMESPACE_END -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // default constructor PortableServer::ForwardRequest::ForwardRequest (void) diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index 27b0f508e6d..87641bc86a7 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -202,7 +202,7 @@ TAO_NAMESPACE PortableServer{ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ObjectId; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_) #define _PORTABLESERVER_FORWARDREQUEST_CH_ @@ -2256,7 +2256,7 @@ TAO_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncop TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&); -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) TAO_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version TAO_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version @@ -2471,7 +2471,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::Current_pt TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::Current::NoContext &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::Current::NoContext &); -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &); diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i index 52ff6573ef1..cfdfdd46370 100644 --- a/TAO/tao/POAC.i +++ b/TAO/tao/POAC.i @@ -3093,7 +3093,7 @@ PortableServer::Current_out::operator-> (void) // **************************************************************** -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate) { diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index e2f25b58d6b..18f77121f07 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -773,7 +773,7 @@ public: // **************************************************************** -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class DynAny; typedef DynAny *DynAny_ptr; diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index 5bf76ca2c7e..1a6b96f32ed 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -235,7 +235,7 @@ TAO_Asynch_Reply_Dispatcher::message_state (void) // ********************************************************************* -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // Constructor. TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher (const CORBA::Request_ptr req) diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index d49513ead14..450d097aec5 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -223,7 +223,7 @@ private: // ********************************************************************* -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class TAO_Export TAO_DII_Deferred_Reply_Dispatcher : public TAO_Reply_Dispatcher { diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i index e836d86db34..24a9f941779 100644 --- a/TAO/tao/Reply_Dispatcher.i +++ b/TAO/tao/Reply_Dispatcher.i @@ -40,7 +40,7 @@ TAO_Asynch_Reply_Dispatcher::transport (TAO_Transport *t) //********************************************************************* -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) ACE_INLINE CORBA::ULong TAO_DII_Deferred_Reply_Dispatcher::reply_status (void) const diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp index dcfdb4a0c37..00e1d901f47 100644 --- a/TAO/tao/Request.cpp +++ b/TAO/tao/Request.cpp @@ -2,7 +2,7 @@ #include "tao/Request.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Object.h" #include "tao/Stub.h" diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h index ba2017dac96..88d580531c6 100644 --- a/TAO/tao/Request.h +++ b/TAO/tao/Request.h @@ -29,7 +29,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/corbafwd.h" #include "tao/ORB.h" diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp index 8456acb2dbd..63cf029f791 100644 --- a/TAO/tao/Servant_Base.cpp +++ b/TAO/tao/Servant_Base.cpp @@ -342,7 +342,7 @@ TAO_Locality_Constrained_ServantBase::_dispatch (CORBA::ServerRequest &, ACE_THROW (CORBA::BAD_OPERATION ()); } -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Object_ptr TAO_DynamicImplementation::_this (CORBA::Environment &ACE_TRY_ENV) diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h index c386fdf472c..a12c427d913 100644 --- a/TAO/tao/Servant_Base.h +++ b/TAO/tao/Servant_Base.h @@ -272,7 +272,7 @@ protected: // Throws CORBA::BAD_OPERATION exception. }; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase { diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h index 0db3d1267f1..99e0626a070 100644 --- a/TAO/tao/Server_Request.h +++ b/TAO/tao/Server_Request.h @@ -83,7 +83,7 @@ public: static CORBA_ServerRequest *_nil (void); // the standard _nil method on pseudo objects -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) virtual void arguments (CORBA::NVList_ptr &list, CORBA_Environment &ACE_TRY_ENV = diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 02b162d3b42..ed67189d3b5 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -270,7 +270,7 @@ private: int old_type_; }; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // DII analogue of the above. diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 22beab107f6..70537d923e6 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -113,7 +113,7 @@ class TAO_Export TAO_Stub // The stub and DII interpreter APIs are member functions of this // type. public: -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void do_dynamic_call (const char *opname, CORBA::Boolean is_roundtrip, @@ -313,7 +313,7 @@ public: // temporary. protected: -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) void put_params (TAO_GIOP_Invocation &call, CORBA::NVList_ptr args, diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp index 0e350127443..0b4bed6e57a 100644 --- a/TAO/tao/Typecode_Constants.cpp +++ b/TAO/tao/Typecode_Constants.cpp @@ -187,7 +187,7 @@ TAO_NAMESPACE_END CORBA::TypeCode_ptr CORBA_ORB::_tc_ObjectId = 0; CORBA::TypeCode_ptr CORBA_ORB::_tc_InvalidName = 0; -#if !defined(TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::TypeCode_ptr CORBA_ORB::_tc_InconsistentTypeCode = 0; @@ -603,7 +603,7 @@ TAO_TypeCodes::init (void) 0, sizeof (CORBA_ORB::ObjectId)); -#if !defined(TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) static const CORBA::Long _oc_CORBA_ORB_InconsistentTypeCode[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -1936,7 +1936,7 @@ TAO_TypeCodes::fini (void) CORBA::release (CORBA::_tc_ORBid); -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::release (CORBA_ORB::_tc_InconsistentTypeCode); CORBA::release (CORBA::_tc_ConstructionPolicy); diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index bbf70ea2292..d976cc7361f 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -12,7 +12,7 @@ #include "tao/Environment.h" #include "tao/CDR.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) // default constructor CORBA_WrongTransaction::CORBA_WrongTransaction (void) diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index 3bc652e8a06..3cbffd7f8cc 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -24,7 +24,7 @@ #include "tao/orbconf.h" -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/corbafwd.h" #include "tao/Exception.h" diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index ff49cafe1cc..837c6dde138 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -169,7 +169,7 @@ typedef class CORBA_Exception *CORBA_Exception_ptr; TAO_SYSTEM_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) class CORBA_WrongTransaction; typedef CORBA_WrongTransaction *CORBA_WrongTransaction_ptr; @@ -737,7 +737,7 @@ TAO_NAMESPACE CORBA typedef CORBA_SystemException SystemException; typedef CORBA_UserException UserException; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) typedef CORBA_DynAny DynAny; typedef DynAny *DynAny_ptr; @@ -1155,7 +1155,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr); TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ServerRequest_ptr req); -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Request_ptr); TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr); @@ -1172,7 +1172,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr); TAO_NAMESPACE_INLINE_FUNCTION void release (ServerRequest_ptr req); -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) TAO_NAMESPACE_INLINE_FUNCTION void release (Request_ptr); TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr); @@ -1268,7 +1268,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Bounds; TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Current; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_NamedValue; #endif /* End of Minimum CORBA */ enum @@ -1402,7 +1402,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS const PolicyType SecConstruction; -#if ! defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_CORBA == 0) typedef CORBA_ConstructionPolicy ConstructionPolicy; typedef CORBA_ConstructionPolicy *ConstructionPolicy_ptr; typedef CORBA_ConstructionPolicy_var ConstructionPolicy_var; diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 26ca2cb49f7..37e0d933150 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -38,17 +38,19 @@ #define TAO_NULL_LOCK_REACTOR ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > #endif /* TAO_NULL_LOCK_REACTOR */ -//#define POA_NO_TIMESTAMP -// // Define this if you don't want POA timestamps in the IOR. Remember, // without timestamps, transient and persistent POA cannot be // distinguished +#if !defined (POA_NO_TIMESTAMP) +# define POA_NO_TIMESTAMP 0 +#endif /* POA_NO_TIMESTAMP */ -//#define TAO_USE_DOTTED_DECIMAL_ADDRESSES -// // If set the ORB will use dotted decimal addresses in the IORs it // exports, this is useful for platforms or environments that cannot // depend on a DNS beign available. +#if !defined (TAO_USE_DOTTED_DECIMAL_ADDRESSES) +# define TAO_USE_DOTTED_DECIMAL_ADDRESSES 0 +#endif /* TAO_USE_DOTTED_DECIMAL_ADDRESSES */ // The default arguments of the resource factory for the fake service // configurator @@ -358,7 +360,9 @@ enum MCAST_SERVICEID #define TAO_HAS_VALUETYPE // Minimum CORBA -// #define TAO_HAS_MINIMUM_CORBA +#if !defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_MINIMUM_CORBA 0 +#endif /* TAO_HAS_MINIMUM_CORBA */ // UIOP support is enabled by default if the platform supports UNIX // domain sockets, and TAO is not configured for minimum CORBA. @@ -394,7 +398,7 @@ enum MCAST_SERVICEID // Default RT_CORBA settings #if !defined (TAO_HAS_RT_CORBA) -# if defined (TAO_HAS_MINIMUM_CORBA) +# if (TAO_HAS_MINIMUM_CORBA == 1) # define TAO_HAS_RT_CORBA 0 # else # define TAO_HAS_RT_CORBA 1 @@ -411,7 +415,7 @@ enum MCAST_SERVICEID // Default MINIMUM_POA settings #if !defined (TAO_HAS_MINIMUM_POA) -# if defined (TAO_HAS_MINIMUM_CORBA) +# if (TAO_HAS_MINIMUM_CORBA == 1) # define TAO_HAS_MINIMUM_POA 1 # else # define TAO_HAS_MINIMUM_POA 0 @@ -445,7 +449,7 @@ enum MCAST_SERVICEID // Default CORBA_MESSAGING settings #if !defined (TAO_HAS_CORBA_MESSAGING) -# if defined (TAO_HAS_MINIMUM_CORBA) +# if (TAO_HAS_MINIMUM_CORBA == 1) # define TAO_HAS_CORBA_MESSAGING 0 # else # define TAO_HAS_CORBA_MESSAGING 1 @@ -725,7 +729,7 @@ enum MCAST_SERVICEID // Default REMOTE_POLICIES settings #if !defined (TAO_HAS_REMOTE_POLICIES) -# if defined (TAO_HAS_MINIMUM_CORBA) +# if (TAO_HAS_MINIMUM_CORBA == 1) # define TAO_HAS_REMOTE_POLICIES 0 # else # define TAO_HAS_REMOTE_POLICIES 1 @@ -744,17 +748,29 @@ and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead. # define TAO_HAS_LOCALITY_CONSTRAINT_POLICIES #endif /* TAO_HAS_REMOTE_POLICIES */ -#if defined (TAO_HAS_MINIMUM_CORBA) // With minimum CORBA, we don't have the ForwardRequest exception. -// Therefore, we can't support the INS forwarding agent. -# if !defined (TAO_NO_IOR_TABLE) -# define TAO_NO_IOR_TABLE +// Therefore, we can't support the INS forwarding agent. Otherwise, +// we allow user to supress it. +#if (TAO_HAS_MINIMUM_CORBA == 1) +# if defined (TAO_NO_IOR_TABLE) +# undef TAO_NO_IOR_TABLE # endif /* TAO_NO_IOR_TABLE */ +# define TAO_NO_IOR_TABLE 1 #else +# if !defined (TAO_NO_IOR_TABLE) +# define TAO_NO_IOR_TABLE 0 +# endif /* TAO_NO_IOR_TABLE */ +#endif /* TAO_HAS_MINIMUM_CORBA */ + // Interceptors is supported by default if we are not building for // MinimumCORBA. -# define TAO_HAS_INTERCEPTORS -#endif /* TAO_HAS_MINIMUM_CORBA */ +#if !defined (TAO_HAS_INTERCEPTORS) +# if (TAO_HAS_MINIMUM_CORBA == 1) +# define TAO_HAS_INTERCEPTORS 0 +# else +# define TAO_HAS_INTERCEPTORS 1 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif // Define the policy types as literals, so they can be used in switch // statements |