diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 934fc6e4c82..3ac9f33ba07 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -4,38 +4,33 @@ // the Typed and Un-typed Event Channels. A check must be made in the code // to ensure the correct EC is referenced. -#include "orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h" +#include "CEC_EventChannel.h" +#include "CEC_ConsumerAdmin.h" +#include "CEC_Reactive_ConsumerControl.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_TypedConsumerAdmin.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h" -#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h" +#include "CEC_ProxyPushSupplier.h" +#include "CEC_ProxyPullSupplier.h" #include "orbsvcs/Time_Utilities.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/Messaging/Messaging.h" -#endif - #include "tao/ORB_Core.h" #include "tao/debug.h" #include "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i" +#include "CEC_Reactive_ConsumerControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_Reactive_ConsumerControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_CEC_Reactive_ConsumerControl constructor for the Un-typed EC TAO_CEC_Reactive_ConsumerControl:: TAO_CEC_Reactive_ConsumerControl (const ACE_Time_Value &rate, @@ -48,9 +43,7 @@ TAO_CEC_Reactive_ConsumerControl:: retries_ (retries), adapter_ (this), event_channel_ (ec), -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) typed_event_channel_ (0), -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 // Initialise timer_id_ to an invalid timer id, so that in case we don't @@ -489,4 +482,3 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL |