diff options
74 files changed, 612 insertions, 344 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 9608c3ec4ab..3a2275c196f 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,153 @@ +Thu Dec 23 12:33:41 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * tao/orbconf.h: + + - Changed the following variables to have a [0/1] + definition. Simply being defined or undefined was not powerful + enough to allow the user to be really selective. + + TAO_HAS_RT_CORBA + TAO_HAS_CORBA_MESSAGING + TAO_HAS_AMI + TAO_HAS_AMI_POLLER + TAO_HAS_AMI_CALLBACK + TAO_HAS_INTERFACE_REPOSITORY + + - These changes are similar to the one Ossama and I made for + TAO_HAS_UIOP. + + - This meant that TAO_DISABLE_RT_CORBA was no longer necessary. + + - Nanbor should probably think about doing the same to + TAO_HAS_INTERCEPTORS. Also, somebody should look into + TAO_HAS_VALUETYPE. + + - TAO_HAS_AMI is new and is similar to the <ami> make rule. + + - The following files were changed to comply with the above + changes: + + Asynch_Invocation.cpp + Asynch_Invocation.h + Asynch_Invocation.i + Buffering_Constraint_Policy.cpp + Buffering_Constraint_Policy.h + Client_Priority_Policy.cpp + Client_Priority_Policy.h + Client_Priority_Policy.i + Direct_Priority_Mapping.cpp + Direct_Priority_Mapping.h + InterfaceC.cpp + InterfaceC.h + Invocation.cpp + Linear_Priority_Mapping.cpp + Linear_Priority_Mapping.h + Makefile + MessagingC.cpp + MessagingC.h + MessagingC.i + MessagingS.cpp + MessagingS.h + MessagingS.i + MessagingS_T.cpp + MessagingS_T.i + Messaging_Policy_i.cpp + Messaging_Policy_i.h + ORB.cpp + ORB.h + ORB_Core.cpp + ORB_Core.h + ORB_Core.i + Object.cpp + Object.h + POA_CORBA.h + Policy_Manager.cpp + Policy_Manager.h + PollableC.cpp + PollableC.h + PollableS.cpp + PollableS.h + Pool_Per_Endpoint.cpp + Priority_Mapping.cpp + Priority_Mapping.h + RT_Current.cpp + RT_Current.h + Reply_Dispatcher.cpp + Reply_Dispatcher.h + Reply_Dispatcher.i + Stub.cpp + Stub.h + Sync_Strategies.cpp + Sync_Strategies.h + TAOC.cpp + TAOC.h + TAOC.i + TAOS.cpp + TAOS.h + Typecode_Constants.cpp + corbafwd.h + default_resource.cpp + rtcorbafwd.cpp + rtcorbafwd.h + + * rules.tao.GNU: + + - If <minimum_corba> is enabled, disable <rt_corba> and + <corba_messaging> by default. Users can still override this to + enable <rt_corba> and <corba_messaging> even if <minimum_corba> + is enabled. + + - Changed <minimum_corba> to be overriden to 0 if it is not + defined to be 1. This make <minimum_corba> consistent with + other variables. + + - Added new flags: <ami_callback> and <ami_poller>. Both of + these are 0 by default. + + - Added new flag <ami>. This one flag can be used to control + both <ami_callback> and <ami_poller>. However, the users can + still control <ami_callback> and <ami_poller> independently. + + - Changed -DTAO_DISABLE_RT_CORBA to -DTAO_HAS_RT_CORBA=0. + + - Changed -DTAO_HAS_CORBA_MESSAGING to -DTAO_HAS_CORBA_MESSAGING=1 + + - Changed -DTAO_HAS_INTERFACE_REPOSITORY to -DTAO_HAS_INTERFACE_REPOSITORY=1 + + - Added -DTAO_HAS_RT_CORBA=1 when rt_corba=1 + + - Added -DTAO_HAS_CORBA_MESSAGING=0 when corba_messaging=0 + + * TAO: Changed + + ifndef minimum_corba + + to: + + ifeq ($(minimum_corba),0) + + to make it consistent with the other variables for the following + Makefiles: + + - examples/Makefile + - examples/POA/Makefile + - orbsvcs/Makefile + - orbsvcs/orbsvcs/Makefile + - orbsvcs/tests/Makefile + - performance-tests/Makefile + - performance-tests/Cubit/TAO/Makefile + - tao/Makefile + - tests/Makefile + + * examples/Buffered_AMI/client.cpp (setup_buffering_constraints): + Changed all ACE_TRY_CHECK to be ACE_CHECK. This is because we + are not in a try block. + + * examples/Makefile (DIRS): Compile Buffered_AMI only when + <ami_callback> is 1. + + * tests/Makefile (DIRS): Compile the AMI test if <ami_callback> is 1. + Thu Dec 23 12:16:38 1999 Christopher Kohlhoff <chris@kohlhoff.com> * TAO/orbsvcs/orbsvcs/: Modified Makefile.bor to include new diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index 86142f701f0..cbbe9433f77 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -145,13 +145,13 @@ setup_buffering_constraints (CORBA::ORB_ptr orb, // Obtain PolicyCurrent. CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; // Narrow down to correct type. CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; // Start off with no constraints. TAO::BufferingConstraint buffering_constraint; @@ -181,17 +181,17 @@ setup_buffering_constraints (CORBA::ORB_ptr orb, orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_constraint_any, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; // Setup the constraints (at the ORB level). policy_current->set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; // We are done with the policy. buffering_constraint_policy_list[0]->destroy (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; // Setup the none sync scope policy, i.e., the ORB will buffer AMI // calls. @@ -210,17 +210,17 @@ setup_buffering_constraints (CORBA::ORB_ptr orb, orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_none_any, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; // Setup the none sync scope (at the ORB level). policy_current->set_policy_overrides (sync_none_policy_list, CORBA::ADD_OVERRIDE, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; // We are now done with these policies. sync_none_policy_list[0]->destroy (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; } int diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile index 1b794ca4638..c450648d385 100644 --- a/TAO/examples/Makefile +++ b/TAO/examples/Makefile @@ -31,7 +31,7 @@ endif include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU -ifndef minimum_corba +ifeq ($(minimum_corba),0) # No POA forwarding in minimum CORBA DIRS += Quoter @@ -41,10 +41,14 @@ endif # minimum_corba ifeq ($(corba_messaging),1) # No Buffered Oneways without CORBA Messaging - DIRS += Buffered_Oneways \ + DIRS += Buffered_Oneways -#### Buffered_AMI doesn't build yet on most platforms. -#### Buffered_AMI + ifeq ($(ami_callback),1) + + # No Buffered Requests without CORBA Messaging and requires AMI callbacks + DIRS += Buffered_AMI + + endif # ami_callback endif # corba_messaging diff --git a/TAO/examples/POA/Makefile b/TAO/examples/POA/Makefile index f762938016a..bba3d8d11d5 100644 --- a/TAO/examples/POA/Makefile +++ b/TAO/examples/POA/Makefile @@ -29,7 +29,7 @@ endif include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ifndef minimum_corba +ifeq ($(minimum_corba),0) # No AdapterActivator in minimum CORBA DIRS += Adapter_Activator diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile index b5feb694818..94a29c6bcd3 100644 --- a/TAO/orbsvcs/Makefile +++ b/TAO/orbsvcs/Makefile @@ -33,7 +33,7 @@ endif include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ifndef minimum_corba +ifeq ($(minimum_corba),0) # ImplRepo uses AdapterActivator which is disabled when compiling with # minimum CORBA support diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index a8f6807c214..d361bd5f26f 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -40,7 +40,7 @@ ifndef TAO_ORBSVCS CosEvent \ Event2 -ifndef minimum_corba +ifeq ($(minimum_corba),0) # Trader uses DynAny which is disabled when compiling with minimum # CORBA support. LifeCycle depend on Trader so don't build diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile index 013d3e6f7ad..fb0aee0e8f2 100644 --- a/TAO/orbsvcs/tests/Makefile +++ b/TAO/orbsvcs/tests/Makefile @@ -35,7 +35,7 @@ endif include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ifndef minimum_corba +ifeq ($(minimum_corba),0) # ImplRepo uses AdapterActivator which is disabled when compiling with # minimum CORBA support. diff --git a/TAO/performance-tests/Cubit/TAO/Makefile b/TAO/performance-tests/Cubit/TAO/Makefile index b3b539cdb8b..28943745aa0 100644 --- a/TAO/performance-tests/Cubit/TAO/Makefile +++ b/TAO/performance-tests/Cubit/TAO/Makefile @@ -22,7 +22,7 @@ endif include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ifndef minimum_corba +ifeq ($(minimum_corba),0) # No DII in minimum CORBA DIRS += DII_Cubit diff --git a/TAO/performance-tests/Makefile b/TAO/performance-tests/Makefile index 10cca358e74..cfb280f2d4a 100644 --- a/TAO/performance-tests/Makefile +++ b/TAO/performance-tests/Makefile @@ -29,7 +29,7 @@ endif include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ifndef minimum_corba +ifeq ($(minimum_corba),0) # No non_existent() in Minimum CORBA DIRS += Latency diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 91879655bfb..96408ba673d 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -46,21 +46,56 @@ ifeq ($(findstring g++,$(CXX)),g++) endif # g++ ifeq ($(minimum_corba),1) + ifndef rt_corba + rt_corba = 0 + endif # ! rt_corba + ifndef corba_messaging + corba_messaging = 0 + endif # ! corba_messaging CPPFLAGS += -DTAO_HAS_MINIMUM_CORBA -else # ! minimum_corba - override minimum_corba = -endif # ! minimum_corba +else # minimum_corba + override minimum_corba = 0 +endif # minimum_corba + +ifeq ($(ami),1) + ifndef ami_callback + ami_callback = 1 + endif # ! ami_callback + ifndef ami_poller + ami_poller = 1 + endif # ! ami_poller + CPPFLAGS += -DTAO_HAS_AMI=1 +else # ami + override ami = 0 + CPPFLAGS += -DTAO_HAS_AMI=0 +endif # ami + +ifeq ($(ami_poller),1) + CPPFLAGS += -DTAO_HAS_AMI_POLLER=1 +else # ami_poller + override ami_poller = 0 + CPPFLAGS += -DTAO_HAS_AMI_POLLER=0 +endif # ami_poller + +ifeq ($(ami_callback),1) + CPPFLAGS += -DTAO_HAS_AMI_CALLBACK=1 +else # ami_callback + override ami_callback = 0 + CPPFLAGS += -DTAO_HAS_AMI_CALLBACK=0 +endif # ami_callback ifeq ($(rt_corba),0) - CPPFLAGS += -DTAO_DISABLE_RT_CORBA + CPPFLAGS += -DTAO_HAS_RT_CORBA=0 else # rt_corba override rt_corba = 1 + CPPFLAGS += -DTAO_HAS_RT_CORBA=1 endif # rt_corba ifeq ($(corba_messaging),0) + CPPFLAGS += -DTAO_HAS_CORBA_MESSAGING=0 else # corba_messaging override corba_messaging = 1 - CPPFLAGS += -DTAO_HAS_CORBA_MESSAGING + CPPFLAGS += -DTAO_HAS_CORBA_MESSAGING=1 endif # corba_messaging ifeq (1,$(CROSS-COMPILE)) @@ -70,10 +105,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8 endif # ! CROSS-COMPILE ifeq ($(interface_repo),1) - CPPFLAGS += -DTAO_HAS_INTERFACE_REPOSITORY + CPPFLAGS += -DTAO_HAS_INTERFACE_REPOSITORY=1 endif # interface_repo - #### #### Event Channel customization. #### diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp index b579f2b8142..02d96fae738 100644 --- a/TAO/tao/Asynch_Invocation.cpp +++ b/TAO/tao/Asynch_Invocation.cpp @@ -48,8 +48,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Asynch_Invocation_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -#if defined (TAO_HAS_CORBA_MESSAGING) -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) void TAO_GIOP_Twoway_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV) @@ -106,8 +106,8 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) return TAO_INVOKE_OK; } -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ //************************************************************************** diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h index 4532c73b303..51754a07423 100644 --- a/TAO/tao/Asynch_Invocation.h +++ b/TAO/tao/Asynch_Invocation.h @@ -29,9 +29,9 @@ #include "tao/MessagingC.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -# if defined (TAO_HAS_AMI_CALLBACK) || (TAO_HAS_AMI_POLLER) +# if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation : public TAO_GIOP_Invocation { @@ -81,9 +81,9 @@ private: // Reply dispatcher for the current synchronous Asynch_Invocation. }; -# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +# endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ //*********************************************************************** diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i index a44dc1efc70..f00ce65d269 100644 --- a/TAO/tao/Asynch_Invocation.i +++ b/TAO/tao/Asynch_Invocation.i @@ -3,9 +3,9 @@ // $Id$ // -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -# if defined (TAO_HAS_AMI_CALLBACK) || (TAO_HAS_AMI_POLLER) +# if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) ACE_INLINE TAO_GIOP_Twoway_Asynch_Invocation:: @@ -14,24 +14,24 @@ TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub, TAO_ORB_Core *orb_core, const TAO_Reply_Handler_Skeleton &reply_handler_skel, Messaging::ReplyHandler_ptr reply_handler_ptr) - : TAO_GIOP_Invocation (stub, - operation, - orb_core), + : TAO_GIOP_Invocation (stub, + operation, + orb_core), rd_ (0) { // New reply dispatcher on the heap, because - // we will go out of scope and hand over the + // we will go out of scope and hand over the // reply dispatcher to the ORB. - // So this->rd_ is 0, because we do not need to + // So this->rd_ is 0, because we do not need to // hold a pointer to it. ACE_NEW (rd_, TAO_Asynch_Reply_Dispatcher (reply_handler_skel, reply_handler_ptr)); } -# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +# endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ //**************************************************************************** @@ -42,19 +42,18 @@ TAO_GIOP_DII_Deferred_Invocation:: TAO_GIOP_DII_Deferred_Invocation (TAO_Stub *stub, TAO_ORB_Core *orb_core, const CORBA::Request_ptr req) - : TAO_GIOP_Invocation (stub, - req->operation (), - orb_core), + : TAO_GIOP_Invocation (stub, + req->operation (), + orb_core), rd_ (0) { // New reply dispatcher on the heap, because - // we will go out of scope and hand over the + // we will go out of scope and hand over the // reply dispatcher to the ORB. - // So this->rd_ is 0, because we do not need to + // So this->rd_ is 0, because we do not need to // hold a pointer to it. ACE_NEW (rd_, TAO_DII_Deferred_Reply_Dispatcher (req)); } #endif /* TAO_HAS_MINIMUM_CORBA */ - diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index 70b2bbb500d..16fe372c12a 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -6,7 +6,7 @@ #include "tao/Buffering_Constraint_Policy.i" #endif /* __ACE_INLINE__ */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) ACE_RCSID(TAO, Buffering_Constraint_Policy, "$Id$") @@ -108,4 +108,4 @@ TAO_Buffering_Constraint_Policy::_default_POA (CORBA_Environment &) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index 5e54d8503a6..acbeafa0fc2 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/TAOS.h" @@ -89,7 +89,7 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if defined (__ACE_INLINE__) #include "tao/Buffering_Constraint_Policy.i" diff --git a/TAO/tao/Client_Priority_Policy.cpp b/TAO/tao/Client_Priority_Policy.cpp index 200c45bd21e..a0ce82e96fc 100644 --- a/TAO/tao/Client_Priority_Policy.cpp +++ b/TAO/tao/Client_Priority_Policy.cpp @@ -6,7 +6,7 @@ #include "tao/Client_Priority_Policy.i" #endif /* __ACE_INLINE__ */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) ACE_RCSID(TAO, Client_Priority_Policy, "$Id$") @@ -117,4 +117,4 @@ TAO_Client_Priority_Policy::_default_POA (CORBA_Environment &) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Client_Priority_Policy.h b/TAO/tao/Client_Priority_Policy.h index dfbbacf6268..972120df484 100644 --- a/TAO/tao/Client_Priority_Policy.h +++ b/TAO/tao/Client_Priority_Policy.h @@ -28,7 +28,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/TAOS.h" @@ -97,7 +97,7 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if defined (__ACE_INLINE__) #include "tao/Client_Priority_Policy.i" diff --git a/TAO/tao/Client_Priority_Policy.i b/TAO/tao/Client_Priority_Policy.i index 6976e97a216..bbbd94029d1 100644 --- a/TAO/tao/Client_Priority_Policy.i +++ b/TAO/tao/Client_Priority_Policy.i @@ -1,5 +1,5 @@ // $Id$ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Direct_Priority_Mapping.cpp b/TAO/tao/Direct_Priority_Mapping.cpp index 11e90ce7f4f..15f654ead3d 100644 --- a/TAO/tao/Direct_Priority_Mapping.cpp +++ b/TAO/tao/Direct_Priority_Mapping.cpp @@ -2,7 +2,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #include "tao/Direct_Priority_Mapping.h" #include "tao/debug.h" @@ -126,4 +126,4 @@ TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, #endif /* ACE_WIN32 */ } -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/Direct_Priority_Mapping.h b/TAO/tao/Direct_Priority_Mapping.h index f23809988cb..118edce2224 100644 --- a/TAO/tao/Direct_Priority_Mapping.h +++ b/TAO/tao/Direct_Priority_Mapping.h @@ -22,7 +22,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #include "tao/Priority_Mapping.h" @@ -69,6 +69,6 @@ private: # include "tao/Direct_Priority_Mapping.i" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ #endif /* TAO_DIRECT_PRIORITY_MAPPING_H */ diff --git a/TAO/tao/InterfaceC.cpp b/TAO/tao/InterfaceC.cpp index ce444dce55a..42034569dc3 100644 --- a/TAO/tao/InterfaceC.cpp +++ b/TAO/tao/InterfaceC.cpp @@ -12,7 +12,7 @@ #include "tao/Stub.h" #include "tao/Invocation.h" -#if defined TAO_HAS_INTERFACE_REPOSITORY +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) #if !defined (__ACE_INLINE__) #include "tao/InterfaceC.i" @@ -18177,4 +18177,4 @@ CORBA::Boolean operator>> ( } -#endif /*TAO_HAS_INTERFACE_REPOSITORY */ +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h index 037489c6191..e50eb1aa1f5 100644 --- a/TAO/tao/InterfaceC.h +++ b/TAO/tao/InterfaceC.h @@ -18,7 +18,7 @@ #include "tao/Sequence_T.h" #include "tao/varout.h" -#if defined TAO_HAS_INTERFACE_REPOSITORY +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -8543,5 +8543,5 @@ operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &); #pragma warning(pop) #endif /* _MSC_VER */ -#endif /*TAO_HAS_INTERFACE_REPOSITORY */ +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ #endif /* ifndef */ diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 7125a3761d7..08ba593c390 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -96,7 +96,7 @@ TAO_GIOP_Invocation::select_profile_based_on_policy (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { -#if !defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 0) this->profile_ = this->stub_->profile_in_use (); return this->profile_; @@ -182,7 +182,7 @@ TAO_GIOP_Invocation::select_profile_based_on_policy return this->profile_; } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 0 */ } @@ -237,7 +237,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) // have the protocol) then we give it another profile to try. // So the invocation Object should handle policy decisions. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_RelativeRoundtripTimeoutPolicy_i *timeout = this->stub_->relative_roundtrip_timeout (); @@ -265,7 +265,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) msecs)); } } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_Countdown_Time countdown (this->max_wait_time_); // Loop until a connection is established or there aren't any more @@ -922,14 +922,14 @@ TAO_GIOP_Oneway_Invocation (TAO_Stub *stub, : TAO_GIOP_Invocation (stub, operation, orb_core), sync_scope_ (TAO::SYNC_WITH_TRANSPORT) { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Sync_Scope_Policy *ssp = stub->sync_scope (); if (ssp) { this->sync_scope_ = ssp->synchronization (); } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } TAO_GIOP_Oneway_Invocation::~TAO_GIOP_Oneway_Invocation (void) @@ -964,7 +964,7 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) } // Create this only if a reply is required. - TAO_Synch_Reply_Dispatcher rd (this->orb_core_, + TAO_Synch_Reply_Dispatcher rd (this->orb_core_, this->service_info_); // The rest of this function is very similar to @@ -1105,8 +1105,8 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) // @@ We should raise a CORBA::NO_MEMORY, but we ran out // of memory already. We need a pre-allocated, TSS, // CORBA::NO_MEMORY instance - ACE_NEW_RETURN (ex, - CORBA::UNKNOWN, + ACE_NEW_RETURN (ex, + CORBA::UNKNOWN, TAO_INVOKE_EXCEPTION); } diff --git a/TAO/tao/Linear_Priority_Mapping.cpp b/TAO/tao/Linear_Priority_Mapping.cpp index e18fa777ccc..27c346394d4 100644 --- a/TAO/tao/Linear_Priority_Mapping.cpp +++ b/TAO/tao/Linear_Priority_Mapping.cpp @@ -2,7 +2,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #include "tao/Linear_Priority_Mapping.h" #include "tao/debug.h" @@ -155,4 +155,4 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, #endif /* ACE_WIN32 */ } -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/Linear_Priority_Mapping.h b/TAO/tao/Linear_Priority_Mapping.h index 7984a5ec2d6..242bc6f27ed 100644 --- a/TAO/tao/Linear_Priority_Mapping.h +++ b/TAO/tao/Linear_Priority_Mapping.h @@ -22,7 +22,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #include "tao/Priority_Mapping.h" @@ -69,6 +69,6 @@ private: # include "tao/Linear_Priority_Mapping.i" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ #endif /* TAO_LINEAR_PRIORITY_MAPPING_H */ diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index c3e879fe990..f092352d2b8 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -179,7 +179,7 @@ ACE_SHLIBS = -lACE include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU -ifndef minimum_corba +ifeq ($(minimum_corba),0) POA_FILES += \ Forwarding_Servant \ diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index b17b95dbf03..81728a5dc32 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -10,7 +10,7 @@ #include "tao/MessagingC.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/MessagingS.h" #include "tao/POA_CORBA.h" @@ -1365,7 +1365,7 @@ TAO_NAMESPACE_END // **************************************************************** -#if defined(TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) // ************************************************************* // Messaging::ExceptionHolder::_tao_seq_Octet @@ -1594,9 +1594,9 @@ OBV_Messaging::ExceptionHolder::marshaled_exception (void) } -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) Messaging::Poller_ptr Messaging::Poller::_narrow ( CORBA::Object_ptr obj, @@ -2059,7 +2059,7 @@ TAO_NAMESPACE_BEGIN (Messaging) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Poller, &_tc_TAO_tc_Messaging_Poller) TAO_NAMESPACE_END -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ // **************************************************************** @@ -2338,7 +2338,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSe // **************************************************************** -#if defined(TAO_HAS_AMI_CALLBACK) || defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( CORBA::Object_ptr obj @@ -2394,11 +2394,11 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_ return 0; } -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ // **************************************************************** -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) void operator<<= (CORBA::Any &_tao_any, Messaging::Poller_ptr _tao_elem) { @@ -2449,36 +2449,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_ ACE_ENDTRY; return 0; } -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Unbounded_Sequence<Messaging::PolicyValue>; -#if defined(TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) template class TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) template class TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>; template class TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var>; -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue> -#if defined(TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) # pragma instantiate TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var> # pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var> -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) # pragma instantiate TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var> # pragma instantiate TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var> -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h index 2a2bb22ee30..f8367d9a97c 100644 --- a/TAO/tao/MessagingC.h +++ b/TAO/tao/MessagingC.h @@ -23,12 +23,12 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) #include "tao/ValueBase.h" #include "tao/ValueFactory.h" -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ #include "tao/corbafwd.h" @@ -1562,7 +1562,7 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES; -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) // valuetype class class ExceptionHolder; @@ -1894,9 +1894,9 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler; -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) class Poller; typedef Poller *Poller_ptr; @@ -2013,12 +2013,12 @@ TAO_NAMESPACE Messaging }; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller; -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ } TAO_NAMESPACE_CLOSE // module Messaging -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) TAO_NAMESPACE OBV_Messaging { @@ -2064,7 +2064,7 @@ TAO_NAMESPACE OBV_Messaging } TAO_NAMESPACE_CLOSE -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ // Typedef for the Reply Handler Skeleton. // This is handcrafted not generated by the IDL compiler. @@ -2087,7 +2087,7 @@ enum TAO_AMI_Reply_Status }; -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) typedef void (*TAO_Reply_Handler_Skeleton)( TAO_InputCDR &, @@ -2095,7 +2095,7 @@ typedef void (*TAO_Reply_Handler_Skeleton)( CORBA::ULong reply_status, CORBA::Environment & ); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ TAO_Export void operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PriorityRange *&); @@ -2111,7 +2111,7 @@ TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); / TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) extern TAO_Export Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( CORBA::Object_ptr obj); @@ -2120,13 +2120,13 @@ TAO_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) // Any operators for interface Messaging::Poller TAO_Export void operator<<= (CORBA::Any &, Messaging::Poller_ptr); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::Poller *&); -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ #ifndef __ACE_INLINE__ @@ -2141,16 +2141,16 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue::_t TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValueSeq &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValueSeq &); -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder::_tao_seq_Octet &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder::_tao_seq_Octet &); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::Poller_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Poller_ptr &); #endif @@ -2166,6 +2166,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Poller_ptr &); #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_IDL_MESSAGINGC_H */ diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i index c950e0ee245..8678acf74b9 100644 --- a/TAO/tao/MessagingC.i +++ b/TAO/tao/MessagingC.i @@ -3020,7 +3020,7 @@ Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong slot) } -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) // ************************************************************* // Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var @@ -3583,9 +3583,9 @@ Messaging::ReplyHandler_out::operator-> (void) return this->ptr_; } -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) ACE_INLINE Messaging::Poller::Poller (void) // default constructor @@ -3945,12 +3945,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue return 0; // error } -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ // **************************************************************** -#if defined(TAO_HAS_AMI_CALLBACK) || defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder *_tao_valuetype) @@ -4054,9 +4054,9 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHo } -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) // **************************************************************** @@ -4109,11 +4109,11 @@ operator>> ( return 0; } -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ // **************************************************************** -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) ACE_INLINE CORBA::Boolean operator<< ( @@ -4164,4 +4164,4 @@ operator>> ( return 0; } -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp index a0583de9c08..6fec3004b4c 100644 --- a/TAO/tao/MessagingS.cpp +++ b/TAO/tao/MessagingS.cpp @@ -10,7 +10,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/MessagingS.h" #include "tao/POA_CORBA.h" @@ -1510,7 +1510,7 @@ POA_Messaging::QueueOrderPolicy::_dispatch ( // **************************************************************** -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) class TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable @@ -1896,11 +1896,11 @@ CORBA::Boolean POA_Messaging::_tao_direct_collocated_ReplyHandler::_non_existent return this->servant_->_non_existent (ACE_TRY_ENV); } -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ // **************************************************************** -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) class TAO_Messaging_Poller_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable { @@ -2392,6 +2392,6 @@ POA_Messaging::Poller::_this (CORBA_Environment &ACE_TRY_ENV) return retval; } -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h index 8cc3ceb4e91..2c73d1cbdd9 100644 --- a/TAO/tao/MessagingS.h +++ b/TAO/tao/MessagingS.h @@ -13,7 +13,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/TimeBaseS.h" #include "tao/POA_CORBA.h" @@ -1602,7 +1602,7 @@ private: #endif /* ACE_HAS_USING_KEYWORD */ -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) class ReplyHandler; typedef ReplyHandler *ReplyHandler_ptr; @@ -1741,9 +1741,9 @@ private: #endif /* ACE_HAS_USING_KEYWORD */ -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) class Poller; typedef Poller *Poller_ptr; @@ -2032,7 +2032,7 @@ private: }; #endif /* ACE_HAS_USING_KEYWORD */ -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ } TAO_NAMESPACE_CLOSE @@ -2047,6 +2047,6 @@ TAO_NAMESPACE_CLOSE #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_IDL_MESSAGINGS_H */ diff --git a/TAO/tao/MessagingS.i b/TAO/tao/MessagingS.i index bb950c58807..cb169078791 100644 --- a/TAO/tao/MessagingS.i +++ b/TAO/tao/MessagingS.i @@ -8,7 +8,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) ACE_INLINE void POA_Messaging::Poller::is_ready_skel ( CORBA::ServerRequest &req, void *obj, @@ -39,4 +39,4 @@ ACE_INLINE void POA_Messaging::Poller::create_pollable_set_skel ( env ); } -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/MessagingS_T.cpp index af9370500a4..71addde084d 100644 --- a/TAO/tao/MessagingS_T.cpp +++ b/TAO/tao/MessagingS_T.cpp @@ -136,7 +136,7 @@ POA_Messaging::QueueOrderPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TR return this->QueueOrderPolicy::_default_POA (ACE_TRY_ENV); } -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) template <class T> PortableServer::POA_ptr POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) @@ -147,9 +147,9 @@ POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_EN return this->ReplyHandler::_default_POA (ACE_TRY_ENV); } -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) template <class T> PortableServer::POA_ptr POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) @@ -159,6 +159,6 @@ POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV) return this->Poller::_default_POA (ACE_TRY_ENV); } -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ #endif /* ifndef */ diff --git a/TAO/tao/MessagingS_T.i b/TAO/tao/MessagingS_T.i index 4af35c3c33d..00d92c671cb 100644 --- a/TAO/tao/MessagingS_T.i +++ b/TAO/tao/MessagingS_T.i @@ -1458,7 +1458,7 @@ void POA_Messaging::QueueOrderPolicy_tie<T>::destroy ( #endif /* ACE_HAS_USING_KEYWORD */ -#if defined(TAO_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) #if defined (ACE_HAS_USING_KEYWORD) template <class T> ACE_INLINE POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t) @@ -1694,4 +1694,4 @@ CORBA::PollableSet_ptr POA_Messaging::Poller_tie<T>::create_pollable_set ( } #endif /* ACE_HAS_USING_KEYWORD */ -#endif /* TAO_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp index 206c309ce1c..8eb14cc9162 100644 --- a/TAO/tao/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging_Policy_i.cpp @@ -2,7 +2,7 @@ #include "tao/Messaging_Policy_i.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #if ! defined (__ACE_INLINE__) #include "tao/Messaging_Policy_i.i" @@ -229,4 +229,4 @@ TAO_Sync_Scope_Policy::_default_POA (CORBA_Environment &) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h index 4d2327be021..6adbfd2ae6d 100644 --- a/TAO/tao/Messaging_Policy_i.h +++ b/TAO/tao/Messaging_Policy_i.h @@ -22,7 +22,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/MessagingS.h" @@ -149,6 +149,6 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_MESSAGING_POLICY_I_H */ diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index ad8f0665dc3..14f2c832149 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -33,7 +33,7 @@ #include "tao/Request.h" #include "tao/MProfile.h" -#if defined (TAO_HAS_INTERFACE_REPOSITORY) +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) # include "tao/InterfaceC.h" #endif /*TAO_HAS_INTERFACE_REPOSITORY */ @@ -41,11 +41,11 @@ # include "tao/ValueFactory_Map.h" #endif /* TAO_HAS_VALUETYPE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/Messaging_Policy_i.h" #include "tao/Client_Priority_Policy.h" #include "tao/Buffering_Constraint_Policy.h" -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if defined (ACE_HAS_EXCEPTIONS) # if defined (ACE_MVS) @@ -411,7 +411,7 @@ CORBA_ORB::resolve_poa_current (CORBA::Environment &ACE_TRY_ENV) CORBA_Object_ptr CORBA_ORB::resolve_policy_manager (CORBA::Environment& ACE_TRY_ENV) { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager *policy_manager = this->orb_core_->policy_manager (); if (policy_manager == 0) @@ -420,18 +420,18 @@ CORBA_ORB::resolve_policy_manager (CORBA::Environment& ACE_TRY_ENV) return policy_manager->_this (ACE_TRY_ENV); #else return CORBA_Object::_nil (); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } CORBA_Object_ptr CORBA_ORB::resolve_policy_current (CORBA::Environment& ACE_TRY_ENV) { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Current &policy_current = this->orb_core_->policy_current (); return policy_current._this (ACE_TRY_ENV); #else return CORBA_Object::_nil (); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } CORBA_Object_ptr @@ -989,7 +989,7 @@ CORBA_ORB::create_dyn_enum (CORBA_TypeCode_ptr tc, return TAO_DynAny_i::create_dyn_enum (tc, ACE_TRY_ENV); } -#if defined (TAO_HAS_INTERFACE_REPOSITORY) +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) CORBA_TypeCode_ptr CORBA_ORB::create_interface_tc (const char * id, @@ -1652,7 +1652,7 @@ CORBA_ORB::string_to_object (const char *str, // **************************************************************** -#if defined(TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr CORBA_ORB::create_policy (CORBA::PolicyType type, @@ -1709,7 +1709,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type, CORBA::Policy::_nil ()); } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // **************************************************************** diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index f35f7e796e7..44360798c58 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -487,7 +487,7 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); -#if defined (TAO_HAS_INTERFACE_REPOSITORY) +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) //Methods added for Philipe Merle for CORBA Script.. CORBA_TypeCode_ptr create_interface_tc (const char * id, const char * name, @@ -607,12 +607,12 @@ public: // Returns a sequence of ObjectIds that lists which objects have // references available via the initial references mechanism. -#if defined(TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any& val, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // ---------------------------------------------------------------- // = TAO-specific extensions to the CORBA specification. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 57b0ac6224c..8506a585ba4 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -78,11 +78,11 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) opt_for_collocation_ (1), use_global_collocation_ (1), collocation_strategy_ (THRU_POA), -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) policy_manager_ (0), default_policies_ (0), policy_current_ (0), -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ poa_current_ (0), object_adapter_ (0), tm_ (), @@ -104,10 +104,10 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) open_lock_ (), open_called_ (0), priority_mapping_ (0), -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) none_sync_strategy_ (0), flush_sync_strategy_ (0), -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ transport_sync_strategy_ (0), svc_config_argc_ (0), svc_config_argv_ (0) @@ -120,7 +120,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) ACE_NEW (this->to_iso8859_, ACE_IBM1047_ISO8859); #endif /* ACE_MVS */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) ACE_NEW (this->none_sync_strategy_, TAO_None_Sync_Strategy); @@ -137,7 +137,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) ACE_NEW (this->policy_current_, TAO_Policy_Current); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_NEW (this->transport_sync_strategy_, TAO_Transport_Sync_Strategy); @@ -151,7 +151,7 @@ TAO_ORB_Core::~TAO_ORB_Core (void) delete this->from_iso8859_; delete this->to_iso8859_; -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) delete this->none_sync_strategy_; delete this->flush_sync_strategy_; @@ -160,7 +160,7 @@ TAO_ORB_Core::~TAO_ORB_Core (void) delete this->default_policies_; delete this->policy_current_; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ delete this->transport_sync_strategy_; @@ -1235,9 +1235,9 @@ TAO_ORB_Core::fini (void) } delete this->reactor_registry_; -#if defined(TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) delete this->priority_mapping_; -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ delete this; @@ -2017,7 +2017,7 @@ TAO_ORB_Core::reactor (TAO_Acceptor *acceptor) int TAO_ORB_Core::get_thread_priority (CORBA::Short &priority) { -#if !defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 0) priority = 0; return 0; #else @@ -2045,13 +2045,13 @@ TAO_ORB_Core::get_thread_priority (CORBA::Short &priority) } return 0; -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 0 */ } int TAO_ORB_Core::set_thread_priority (CORBA::Short priority) { -#if !defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 0) ACE_UNUSED_ARG (priority); return 0; #else @@ -2068,10 +2068,10 @@ TAO_ORB_Core::set_thread_priority (CORBA::Short priority) return -1; return 0; -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 0 */ } -CORBA::Object_ptr +CORBA::Object_ptr TAO_ORB_Core::implrepo_service (void) { if (!this->use_implrepo_) @@ -2088,7 +2088,7 @@ TAO_ORB_Core::implrepo_service (void) ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ()); // @@ Worry about assigning a different IOR? (brunsch) - this->implrepo_service_ = temp._retn (); + this->implrepo_service_ = temp._retn (); } ACE_CATCHANY { @@ -2156,9 +2156,9 @@ TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void) TAO_TSS_Resources::TAO_TSS_Resources (void) : poa_current_impl_ (0), default_environment_ (&this->tss_environment_) -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) , policy_current_ (&this->initial_policy_current_) -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ { } diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 3835ca9920a..cfb6185452d 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -53,12 +53,12 @@ class TAO_Reactor_Registry; class TAO_Leader_Follower; class TAO_Priority_Mapping; -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) class TAO_None_Sync_Strategy; class TAO_Flush_Sync_Strategy; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ class TAO_Transport_Sync_Strategy; @@ -306,7 +306,7 @@ public: // on the heap and/or as class members; we need to investigate the // tradeoffs and take a decision. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager *policy_manager (void); // Return the Policy_Manager for this ORB. @@ -331,9 +331,9 @@ public: TAO_Buffering_Constraint_Policy *default_buffering_constraint (void) const; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_None_Sync_Strategy &none_sync_strategy (void); // This strategy will buffer messages. @@ -341,25 +341,25 @@ public: TAO_Flush_Sync_Strategy &flush_sync_strategy (void); // This strategy will flush any buffered messages. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Transport_Sync_Strategy &transport_sync_strategy (void); // This strategy will sync with the transport. -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) TAO_Priority_Mapping *priority_mapping (void); // Access the priority mapping class, this is a TAO extension but // there is no standard way to get to it either. -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ int get_thread_priority (CORBA::Short &priority); int set_thread_priority (CORBA::Short priority); // Accessor and modifier to the current thread priority, used to // implement the RTCORBA::Current interface, but it is faster for // some critical components. - // If TAO_HAS_RT_CORBA is not defined the operations are noops. + // If TAO_HAS_RT_CORBA == 0, the operations are noops. TAO_ORB_Core_TSS_Resources* get_tss_resources (void); // Obtain the TSS resources of this orb. @@ -525,7 +525,7 @@ protected: CORBA::ULong collocation_strategy_; // Default collocation policy. This should never be ORB_CONTROL. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager *policy_manager_; // The Policy_Manager for this ORB. @@ -534,7 +534,7 @@ protected: TAO_Policy_Current *policy_current_; // Policy current. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_POA_Current *poa_current_; // POA current. @@ -591,7 +591,7 @@ protected: TAO_Priority_Mapping *priority_mapping_; // The priority mapping. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_None_Sync_Strategy *none_sync_strategy_; // This strategy will buffer messages. @@ -599,7 +599,7 @@ protected: TAO_Flush_Sync_Strategy *flush_sync_strategy_; // This strategy will flush any buffered messages. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Transport_Sync_Strategy *transport_sync_strategy_; // This strategy will sync with the transport. @@ -673,14 +673,14 @@ public: // If the user (or library) provides no environment the ORB_Core // still holds one. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Current_Impl initial_policy_current_; // The initial PolicyCurrent for this thread. Should be a TSS // resource. TAO_Policy_Current_Impl *policy_current_; // This pointer is reset by the POA on each upcall. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ }; // @@ Must go away.... diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index e35947342e0..30ca60678b3 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -114,7 +114,7 @@ TAO_ORB_Core::to_unicode (void) const return this->to_unicode_; } -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Manager * TAO_ORB_Core::policy_manager (void) { @@ -153,7 +153,7 @@ TAO_ORB_Core::default_buffering_constraint (void) const return this->default_policies_->buffering_constraint (); } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_INLINE TAO_ORB_Core_TSS_Resources* TAO_ORB_Core::get_tss_resources (void) @@ -202,7 +202,7 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir) // **************************************************************** -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_None_Sync_Strategy & TAO_ORB_Core::none_sync_strategy (void) @@ -216,7 +216,7 @@ TAO_ORB_Core::flush_sync_strategy (void) return *this->flush_sync_strategy_; } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_INLINE TAO_Transport_Sync_Strategy & TAO_ORB_Core::transport_sync_strategy (void) @@ -224,7 +224,7 @@ TAO_ORB_Core::transport_sync_strategy (void) return *this->transport_sync_strategy_; } -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Current & TAO_ORB_Core::policy_current (void) @@ -232,9 +232,9 @@ TAO_ORB_Core::policy_current (void) return *this->policy_current_; } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) ACE_INLINE TAO_Priority_Mapping * TAO_ORB_Core::priority_mapping (void) @@ -242,7 +242,7 @@ TAO_ORB_Core::priority_mapping (void) return this->priority_mapping_; } -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ ACE_INLINE TAO_POA_Current & TAO_ORB_Core::poa_current (void) const diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 36a4e6de5e1..8ecc88a0e27 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -17,9 +17,9 @@ #include "tao/Connector_Registry.h" #include "tao/debug.h" -#if defined (TAO_HAS_INTERFACE_REPOSITORY) +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) #include "tao/InterfaceC.h" -#endif /* TAO_HAS_INTERFACE_REPOSITORY */ +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ #include "ace/Auto_Ptr.h" @@ -407,11 +407,11 @@ CORBA_Object::_request (const CORBA::Char *operation, CORBA::InterfaceDef_ptr CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) { -#if defined (TAO_HAS_INTERFACE_REPOSITORY) +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) CORBA::InterfaceDef_ptr _tao_retval = CORBA::InterfaceDef::_nil(); #else CORBA::InterfaceDef_ptr _tao_retval = 0; -#endif /* TAO_HAS_INTERFACE_REPOSITORY */ +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ TAO_Stub *istub = this->_stubobj (); if (istub == 0) @@ -452,7 +452,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) break; } -#if defined (TAO_HAS_INTERFACE_REPOSITORY) +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( (_tao_in >> _tao_retval) @@ -463,7 +463,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) #else ACE_UNUSED_ARG (_tao_retval); ACE_THROW_RETURN (CORBA::INTF_REPOS (), _tao_retval); -#endif /* TAO_HAS_INTERFACE_REPOSITORY */ +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ } CORBA::ImplementationDef_ptr @@ -479,7 +479,7 @@ CORBA_Object::_get_implementation (CORBA::Environment &) // @@ Does it make sense to support policy stuff for locality constrained // objects? Also, does it make sense to bind policies with stub object? // - nw. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr CORBA_Object::_get_policy ( CORBA::PolicyType type, @@ -560,7 +560,7 @@ CORBA_Object::_validate_connection (CORBA::PolicyList_out inconsistent_policies, return 0; } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // **************************************************************** diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 2eb119c84b0..6569fead04c 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -125,7 +125,7 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr _get_policy ( CORBA::PolicyType type, CORBA::Environment &ACE_TRY_ENV = @@ -152,7 +152,7 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ virtual CORBA::ULong _hash (CORBA::ULong maximum, CORBA_Environment &ACE_TRY_ENV = diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index bf8c98a3036..a1b9f1ba5f3 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -39,9 +39,9 @@ #include "tao/DynAnyC.h" #include "tao/DomainC.h" #include "tao/Servant_Base.h" -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) #include "tao/PollableC.h" -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -424,7 +424,7 @@ public: // **************************************************************** -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) class Pollable; typedef Pollable *Pollable_ptr; @@ -763,7 +763,7 @@ public: private: PollableSet_ptr servant_; }; -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ // **************************************************************** diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 67ed5640909..6508f2d0585 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -2,7 +2,7 @@ #include "tao/Policy_Manager.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/Environment.h" #include "tao/ORB_Core.h" @@ -516,4 +516,4 @@ TAO_Policy_Current::implementation (void) const return *TAO_TSS_RESOURCES::instance ()->policy_current_; } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index e28e71ba831..bc6907c5a4b 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -22,7 +22,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/POA_CORBA.h" @@ -246,6 +246,6 @@ public: # include "tao/Policy_Manager.i" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_POLICY_MANAGER_H */ diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 53d86ddd52c..c77af006ca8 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -19,7 +19,7 @@ #include "tao/PollableC.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) && (TAO_HAS_AMI_POLLER == 1) #include "tao/POA_CORBA.h" #include "tao/Stub.h" @@ -1274,4 +1274,4 @@ operator>> ( return 0; } -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index 56c273f8cd1..c33a4fc6d40 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -22,7 +22,7 @@ #include "tao/corbafwd.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) && (TAO_HAS_AMI_POLLER == 1) #include "tao/Object.h" #include "tao/Exception.h" @@ -440,6 +440,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PollableSet::Unknown #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_AMI_POLLER == 1 */ #endif /* TAO_IDL_POLLABLEC_H */ diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp index 34c54e93b9d..cb4a354613d 100644 --- a/TAO/tao/PollableS.cpp +++ b/TAO/tao/PollableS.cpp @@ -19,7 +19,7 @@ #include "tao/PollableS.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) && (TAO_HAS_AMI_POLLER == 1) #include "tao/Operation_Table.h" #include "tao/Server_Request.h" @@ -971,4 +971,4 @@ POA_CORBA::PollableSet::_this (CORBA_Environment &ACE_TRY_ENV) return retval; } -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h index cd0c8e5ebd3..abc0d4c079a 100644 --- a/TAO/tao/PollableS.h +++ b/TAO/tao/PollableS.h @@ -22,7 +22,7 @@ #include "tao/PollableC.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) && (TAO_HAS_AMI_POLLER == 1) #include "tao/POA_CORBA.h" @@ -236,6 +236,6 @@ TAO_NAMESPACE_CLOSE #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_AMI_POLLER == 1 */ #endif /* ifndef */ diff --git a/TAO/tao/Pool_Per_Endpoint.cpp b/TAO/tao/Pool_Per_Endpoint.cpp index 3afaddd098d..e2d28d8c409 100644 --- a/TAO/tao/Pool_Per_Endpoint.cpp +++ b/TAO/tao/Pool_Per_Endpoint.cpp @@ -42,7 +42,7 @@ TAO_Pool_Per_Endpoint::run (CORBA::Environment &ACE_TRY_ENV) int priority = ACE_Sched_Params::priority_min (this->policy_); -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) RTCORBA::PriorityMapping *pm = this->orb_->orb_core ()->priority_mapping (); const CORBA::Short corba_priority = (*i)->priority (); @@ -54,7 +54,7 @@ TAO_Pool_Per_Endpoint::run (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("TAO (%P|%t) - creating thread at priority %d:%d\n"), priority, corba_priority)); -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ if (this->activate (this->flags_, this->poolsize_, /* number of threads */ 1, /* force active */ diff --git a/TAO/tao/Priority_Mapping.cpp b/TAO/tao/Priority_Mapping.cpp index 7bdad39a60b..aafd60b22b4 100644 --- a/TAO/tao/Priority_Mapping.cpp +++ b/TAO/tao/Priority_Mapping.cpp @@ -2,7 +2,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #include "tao/Priority_Mapping.h" @@ -34,4 +34,4 @@ TAO_Priority_Mapping::to_CORBA (RTCORBA::NativePriority, return 0; } -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/Priority_Mapping.h b/TAO/tao/Priority_Mapping.h index 141cceeae0b..6aeff91fc4b 100644 --- a/TAO/tao/Priority_Mapping.h +++ b/TAO/tao/Priority_Mapping.h @@ -22,7 +22,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #include "tao/rtcorbafwd.h" @@ -58,6 +58,6 @@ public: # include "tao/Priority_Mapping.i" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ #endif /* TAO_PRIORITY_MAPPING_H */ diff --git a/TAO/tao/RT_Current.cpp b/TAO/tao/RT_Current.cpp index 9917e641a36..f6d98af18c4 100644 --- a/TAO/tao/RT_Current.cpp +++ b/TAO/tao/RT_Current.cpp @@ -4,7 +4,7 @@ #include "tao/RT_Current.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #include "tao/Stub.h" #include "tao/ORB_Core.h" @@ -99,4 +99,4 @@ TAO_RT_Current::the_priority ( ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); } -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/RT_Current.h b/TAO/tao/RT_Current.h index fe212468c8f..9ed7a96aca0 100644 --- a/TAO/tao/RT_Current.h +++ b/TAO/tao/RT_Current.h @@ -18,7 +18,7 @@ #include "tao/rtcorbafwd.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #include "tao/Exception.h" #include "tao/CurrentC.h" @@ -143,6 +143,6 @@ private: # include "tao/RT_Current.i" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ #endif /* TAO_RT_CURRENT_H */ diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index 999398cdb7b..8add1236a1a 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -135,9 +135,9 @@ TAO_Synch_Reply_Dispatcher::leader_follower_condition_variable (TAO_Transport *t // ********************************************************************* -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) // Constructor. TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (const TAO_Reply_Handler_Skeleton &reply_handler_skel, @@ -229,9 +229,9 @@ TAO_Asynch_Reply_Dispatcher::message_state (void) return this->message_state_; } -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // ********************************************************************* diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 8ee6816d2eb..bf5ecd50b01 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -140,9 +140,9 @@ private: // ********************************************************************* -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -# if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +# if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) class TAO_Export TAO_Asynch_Reply_Dispatcher : public TAO_Reply_Dispatcher { @@ -206,9 +206,9 @@ private: // Reply Handler passed in the Asynchronous Invocation. }; -# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +# endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // ********************************************************************* diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i index 647b8b802ae..696c2f07b4e 100644 --- a/TAO/tao/Reply_Dispatcher.i +++ b/TAO/tao/Reply_Dispatcher.i @@ -12,7 +12,7 @@ TAO_Synch_Reply_Dispatcher::version (void) const return this->version_; } -#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) && (TAO_HAS_AMI_POLLER == 1) ACE_INLINE CORBA::ULong TAO_Asynch_Reply_Dispatcher::reply_status (void) const @@ -26,7 +26,7 @@ TAO_Asynch_Reply_Dispatcher::version (void) const return this->version_; } -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_AMI_POLLER == 1 */ //********************************************************************* @@ -45,4 +45,3 @@ TAO_DII_Deferred_Reply_Dispatcher::version (void) const } #endif /* TAO_HAS_MINIMUM_CORBA */ - diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 7056e58e5fd..804d4b02ea1 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -82,9 +82,9 @@ TAO_Stub::TAO_Stub (char *repository_id, orb_core_ (orb_core), orb_ (), servant_orb_ () -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) , policies_ (0) -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ { if (this->orb_core_ == 0) { @@ -133,9 +133,9 @@ TAO_Stub::~TAO_Stub (void) delete this->profile_lock_ptr_; -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) delete this->policies_; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } void @@ -802,7 +802,7 @@ TAO_Stub::put_params (TAO_GIOP_Invocation &call, // **************************************************************** -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr TAO_Stub::get_policy ( @@ -1133,13 +1133,13 @@ TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies, return 1; } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Sync_Strategy & TAO_Stub::sync_strategy (void) { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) POA_Messaging::SyncScopePolicy *policy = this->sync_scope (); @@ -1160,7 +1160,7 @@ TAO_Stub::sync_strategy (void) return this->orb_core_->flush_sync_strategy (); } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ return this->orb_core_->transport_sync_strategy (); } diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index c8df3592bde..e09560a16bc 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -40,13 +40,13 @@ #include "tao/MProfile.h" #include "tao/ORB.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) // Forward declarations. class TAO_RelativeRoundtripTimeoutPolicy_i; class TAO_Client_Priority_Policy; class TAO_Sync_Scope_Policy; class TAO_Buffering_Constraint_Policy; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ class TAO_Sync_Strategy; class TAO_GIOP_Invocation; @@ -278,7 +278,7 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr get_policy ( CORBA::PolicyType type, CORBA::Environment &ACE_TRY_ENV = @@ -314,7 +314,7 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Sync_Strategy &sync_strategy (void); // Return the sync strategy to be used in by the transport. @@ -512,11 +512,11 @@ private: // 2. we can search for the servant/POA's status starting from // the ORB's RootPOA. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager_Impl *policies_; // The policy overrides in this object, if nil then use the default // policies. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // = Disallow copy constructor and assignment operator ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &)) diff --git a/TAO/tao/Sync_Strategies.cpp b/TAO/tao/Sync_Strategies.cpp index f509f066c88..0ac0b7936c3 100644 --- a/TAO/tao/Sync_Strategies.cpp +++ b/TAO/tao/Sync_Strategies.cpp @@ -26,7 +26,7 @@ TAO_Transport_Sync_Strategy::send (TAO_Transport &transport, max_wait_time); } -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) ssize_t TAO_None_Sync_Strategy::send (TAO_Transport &transport, @@ -179,4 +179,4 @@ TAO_Flush_Sync_Strategy::buffering_constraints_reached (TAO_Transport &, return 1; } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h index b4cb70e0e4b..08dcd335a3b 100644 --- a/TAO/tao/Sync_Strategies.h +++ b/TAO/tao/Sync_Strategies.h @@ -49,7 +49,7 @@ public: const ACE_Time_Value *max_wait_time); }; -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) class TAO_Export TAO_None_Sync_Strategy : public TAO_Sync_Strategy { @@ -77,7 +77,7 @@ public: TAO_Transport_Buffering_Queue &buffering_queue); }; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if defined (__ACE_INLINE__) # include "tao/Sync_Strategies.i" diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 8df184a69ea..b33be5c901f 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -15,7 +15,7 @@ #include "tao/TAOC.i" #endif /* !defined INLINE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) static const CORBA::Long _oc_TAO_PrioritySelectionMode[] = { @@ -529,7 +529,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::BufferingConstraint # pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_NAMESPACE_TYPE (const CORBA::Short) TAO_NAMESPACE_BEGIN (TAO) diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 8684609d3e5..9b7c39250da 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -17,12 +17,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/PolicyC.h" #include "tao/TimeBaseC.h" -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -44,7 +44,7 @@ TAO_NAMESPACE TAO { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) typedef CORBA::Short PrioritySelectionMode; typedef CORBA::Short_out PrioritySelectionMode_out; @@ -396,10 +396,10 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // It seems easier to have copies of these here than to use - // #if defined (TAO_HAS_CORBA_MESSAGING) everywhere or to + // #if (TAO_HAS_CORBA_MESSAGING == 1) everywhere or to // define a new class TAO_GIOP_Reliable_Oneway_Invocation typedef CORBA::Short SyncScope; @@ -415,7 +415,7 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy } TAO_NAMESPACE_CLOSE // module TAO -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Export void operator<<= (CORBA::Any &, const TAO::PrioritySpecification &); // copying version TAO_Export void operator<<= (CORBA::Any &, TAO::PrioritySpecification*); // noncopying version @@ -430,18 +430,18 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstra void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy *&); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #ifndef __ACE_INLINE__ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::PrioritySpecification &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::PrioritySpecification &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i index 7ae034a1c5a..cc0e7b01748 100644 --- a/TAO/tao/TAOC.i +++ b/TAO/tao/TAOC.i @@ -11,7 +11,7 @@ // Inline operations for class TAO::PrioritySpecification_var // ************************************************************* -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO::PrioritySpecification_var::PrioritySpecification_var (void) // default constructor @@ -655,4 +655,4 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstrai } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/TAOS.cpp b/TAO/tao/TAOS.cpp index f38acff40ff..e04923885cd 100644 --- a/TAO/tao/TAOS.cpp +++ b/TAO/tao/TAOS.cpp @@ -13,7 +13,7 @@ #include "tao/TAOS.i" #endif /* !defined INLINE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) // skeleton constructor POA_TAO::ClientPriorityPolicy::ClientPriorityPolicy (void) @@ -225,4 +225,4 @@ TAO::BufferingConstraint POA_TAO::_tao_direct_collocated_BufferingConstraintPoli } -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h index 987a93955c2..0485ef30c6c 100644 --- a/TAO/tao/TAOS.h +++ b/TAO/tao/TAOS.h @@ -12,11 +12,11 @@ #include "tao/TAOC.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/POA_CORBA.h" -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +32,7 @@ TAO_NAMESPACE POA_TAO { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) class ClientPriorityPolicy; typedef ClientPriorityPolicy *ClientPriorityPolicy_ptr; @@ -178,7 +178,7 @@ TAO_NAMESPACE POA_TAO #endif /* end #if !defined */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } TAO_NAMESPACE_CLOSE diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp index 640d27bd2b9..59070461784 100644 --- a/TAO/tao/Typecode_Constants.cpp +++ b/TAO/tao/Typecode_Constants.cpp @@ -41,9 +41,9 @@ #include "tao/NVList.h" #include "tao/BoundsC.h" -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) #include "tao/PollableC.h" -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ ACE_RCSID(tao, Typecode_Constants, "$Id$") @@ -1615,7 +1615,7 @@ TAO_TypeCodes::init (void) // **************************************************************** -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) static const CORBA::Long _oc_CORBA_Pollable[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -1693,7 +1693,7 @@ TAO_TypeCodes::init (void) 0, sizeof (CORBA_PollableSet)); -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ // **************************************************************** @@ -1977,13 +1977,13 @@ TAO_TypeCodes::fini (void) CORBA::release (CORBA::_tc_DomainManagerList); -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) CORBA::release (CORBA::_tc_Pollable); CORBA::release (CORBA::_tc_DIIPollable); CORBA::release (CORBA::_tc_PollableSet); -#endif /* defined (TAO_HAS_AMI_POLLER) */ +#endif /* (TAO_HAS_AMI_POLLER == 1) */ // Service types //= Service type diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 0c4b93b126e..ee1262bdc2f 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -1106,7 +1106,7 @@ TAO_NAMESPACE CORBA typedef CORBA_EnumMemberSeq *EnumMemberSeq_ptr; typedef CORBA_EnumMemberSeq_out EnumMemberSeq_out; typedef CORBA_EnumMemberSeq_var EnumMemberSeq_var; -#endif /* TAO_HAS_INTERFACE_REPOSITORY */ +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ typedef CORBA_Bounds Bounds; typedef CORBA_Bounds *Bounds_ptr; diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index f9268453237..57563e25cea 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -674,7 +674,7 @@ TAO_Default_Resource_Factory::purge_percentage (void) const TAO_Priority_Mapping * TAO_Default_Resource_Factory::get_priority_mapping (void) { -#if !defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 0) return 0; #else TAO_Priority_Mapping *pm; @@ -697,7 +697,7 @@ TAO_Default_Resource_Factory::get_priority_mapping (void) break; } return pm; -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 0 */ } // **************************************************************** diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index b54f346d3f5..2887004968b 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -379,17 +379,114 @@ enum MCAST_SERVICEID # endif /* TAO_HAS_MINIMUM_CORBA */ #endif /* !TAO_HAS_UIOP */ -// INTERFACE_REPOSITORY -//#define TAO_HAS_INTERFACE_REPOSITORY -// Without Minimum CORBA, the user will get regular (no locality -// constraints) policies by default. With Minimum CORBA, the user -// will get locality constraint policies by default. -// -// If #define TAO_HAS_REMOTE_POLICIES 0, then the user will always get -// locality constraint policies (regardless of Minimum CORBA). -// -// If #define TAO_HAS_REMOTE_POLICIES 1, then the user will always get -// regular policies (regardless of Minimum CORBA). +// RT_CORBA support is enabled by default if TAO is not configured for +// minimum CORBA. If TAO is configured for minimum CORBA, then +// RT_CORBA will be disabled by default. +// To explicitly enable RT_CORBA support uncomment the following +// #define TAO_HAS_RT_CORBA 1 +// To explicitly disable RT_CORBA support uncomment the following +// #define TAO_HAS_RT_CORBA 0 + +// Default RT_CORBA settings +#if !defined (TAO_HAS_RT_CORBA) +# if defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_RT_CORBA 0 +# else +# define TAO_HAS_RT_CORBA 1 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* !TAO_HAS_RT_CORBA */ + +// CORBA_MESSAGING support is enabled by default if TAO is not +// configured for minimum CORBA. If TAO is configured for minimum +// CORBA, then CORBA_MESSAGING will be disabled by default. +// To explicitly enable CORBA_MESSAGING support uncomment the following +// #define TAO_HAS_CORBA_MESSAGING 1 +// To explicitly disable CORBA_MESSAGING support uncomment the following +// #define TAO_HAS_CORBA_MESSAGING 0 + +// Default CORBA_MESSAGING settings +#if !defined (TAO_HAS_CORBA_MESSAGING) +# if defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_CORBA_MESSAGING 0 +# else +# define TAO_HAS_CORBA_MESSAGING 1 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* !TAO_HAS_CORBA_MESSAGING */ + +// AMI support is disabled by default, irrespective of whether TAO is +// configured for minimum CORBA. +// To explicitly enable AMI support uncomment the following +// #define TAO_HAS_AMI 1 +// To explicitly disable AMI support uncomment the following +// #define TAO_HAS_AMI 0 + +// Default AMI settings +#if !defined (TAO_HAS_AMI) +# define TAO_HAS_AMI 0 +#endif /* !TAO_HAS_AMI */ + +// AMI_POLLER support is disabled by default if TAO is not configured +// for AMI. If TAO is configured for AMI, then AMI_POLLER will be +// enabled by default. +// To explicitly enable AMI_POLLER support uncomment the following +// #define TAO_HAS_AMI_POLLER 1 +// To explicitly disable AMI_POLLER support uncomment the following +// #define TAO_HAS_AMI_POLLER 0 + +// Default AMI_POLLER settings +#if !(TAO_HAS_AMI_POLLER == 1) +# if (TAO_HAS_AMI == 1) +# define TAO_HAS_AMI_POLLER 1 +# else +# define TAO_HAS_AMI_POLLER 0 +# endif /* TAO_HAS_AMI == 1 */ +#endif /* !TAO_HAS_AMI_POLLER */ + +// AMI_CALLBACK support is disabled by default if TAO is not configured +// for AMI. If TAO is configured for AMI, then AMI_CALLBACK will be +// enabled by default. +// To explicitly enable AMI_CALLBACK support uncomment the following +// #define TAO_HAS_AMI_CALLBACK 1 +// To explicitly disable AMI_CALLBACK support uncomment the following +// #define TAO_HAS_AMI_CALLBACK 0 + +// Default AMI_CALLBACK settings +#if !(TAO_HAS_AMI_CALLBACK == 1) +# if (TAO_HAS_AMI == 1) +# define TAO_HAS_AMI_CALLBACK 1 +# else +# define TAO_HAS_AMI_CALLBACK 0 +# endif /* TAO_HAS_AMI == 1 */ +#endif /* !TAO_HAS_AMI_CALLBACK */ + +// INTERFACE_REPOSITORY support is disabled by default, irrespective +// of whether TAO is configured for minimum CORBA. +// To explicitly enable INTERFACE_REPOSITORY support uncomment the following +// #define TAO_HAS_INTERFACE_REPOSITORY 1 +// To explicitly disable INTERFACE_REPOSITORY support uncomment the following +// #define TAO_HAS_INTERFACE_REPOSITORY 0 + +// Default INTERFACE_REPOSITORY settings +#if !defined (TAO_HAS_INTERFACE_REPOSITORY) +# define TAO_HAS_INTERFACE_REPOSITORY 0 +#endif /* !TAO_HAS_INTERFACE_REPOSITORY */ + +// REMOTE_POLICIES support is enabled by default if TAO is not +// configured for minimum CORBA. If TAO is configured for minimum +// CORBA, then REMOTE_POLICIES will be disabled by default. +// To explicitly enable REMOTE_POLICIES support uncomment the following +// #define TAO_HAS_REMOTE_POLICIES 1 +// To explicitly disable REMOTE_POLICIES support uncomment the following +// #define TAO_HAS_REMOTE_POLICIES 0 + +// Default REMOTE_POLICIES settings +#if !defined (TAO_HAS_REMOTE_POLICIES) +# if defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_REMOTE_POLICIES 0 +# else +# define TAO_HAS_REMOTE_POLICIES 1 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* !TAO_HAS_REMOTE_POLICIES */ // TAO_HAS_LOCALITY_CONSTRAINT_POLICIES is an internal macro and // should not be set by the user. @@ -399,44 +496,22 @@ enum MCAST_SERVICEID and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead. #endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ -#if defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_REMOTE_POLICIES == 0) +# 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 # endif /* TAO_NO_IOR_TABLE */ - -# if !defined (TAO_HAS_REMOTE_POLICIES) -# define TAO_HAS_REMOTE_POLICIES 0 -# endif /* TAO_HAS_REMOTE_POLICIES */ - #else - -// Interceptors is supported by default if we are not building -// for MinimumCORBA. -#define TAO_HAS_INTERCEPTORS - +// Interceptors is supported by default if we are not building for +// MinimumCORBA. +# define TAO_HAS_INTERCEPTORS #endif /* TAO_HAS_MINIMUM_CORBA */ -#if !defined (TAO_DISABLE_RT_CORBA) && !defined (TAO_HAS_MINIMUM_CORBA) -# define TAO_HAS_RT_CORBA -#endif /* !TAO_HAS_RT_CORBA && !TAO_HAS_MINIMUM_CORBA */ - -// Policies are not locality constraint by default. -#if !defined (TAO_HAS_REMOTE_POLICIES) -# define TAO_HAS_REMOTE_POLICIES 1 -#endif /* TAO_HAS_REMOTE_POLICIES */ - -#if (TAO_HAS_REMOTE_POLICIES == 0) -# define TAO_HAS_LOCALITY_CONSTRAINT_POLICIES -#endif /* TAO_HAS_REMOTE_POLICIES */ - -// CORBA Messaging -#if !defined (TAO_HAS_CORBA_MESSAGING) -# define TAO_HAS_CORBA_MESSAGING -#endif /* TAO_HAS_CORBA_MESSAGING */ - // Define the policy types as literals, so they can be used in switch // statements diff --git a/TAO/tao/rtcorbafwd.cpp b/TAO/tao/rtcorbafwd.cpp index d9d055533b1..9c2398619f2 100644 --- a/TAO/tao/rtcorbafwd.cpp +++ b/TAO/tao/rtcorbafwd.cpp @@ -2,7 +2,7 @@ #include "tao/rtcorbafwd.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #if !defined (__ACE_INLINE__) # include "tao/rtcorbafwd.i" @@ -20,4 +20,4 @@ TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const RTCORBA::Priority, maxPriority, 32767) TAO_NAMESPACE_END -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ diff --git a/TAO/tao/rtcorbafwd.h b/TAO/tao/rtcorbafwd.h index ed769d3e573..8475baddb89 100644 --- a/TAO/tao/rtcorbafwd.h +++ b/TAO/tao/rtcorbafwd.h @@ -25,7 +25,7 @@ #include "tao/corbafwd.h" -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -69,6 +69,6 @@ TAO_NAMESPACE_CLOSE // end of class (namespace) RTCORBA # include "tao/rtcorbafwd.i" #endif /* ! __ACE_INLINE__ */ -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ #endif /* TAO_RTCORBAFWD_H */ diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index 8380210e0a3..9a7d5208c9b 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -36,20 +36,27 @@ endif include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ifndef minimum_corba +ifeq ($(minimum_corba),0) # No DynAny in minimum CORBA DIRS += DynAny_Test # No NVList and Context in minimum CORBA DIRS += Param_Test \ - DSI_Gateway + DSI_Gateway # No Implicit activation in minimum CORBA DIRS += Faults endif # minimum_corba +ifeq ($(ami_callback),1) + +# Requires AMI callbacks + DIRS += AMI + +endif # ami_callback + include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU |