diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index b7a49603b36..1c4c713d48e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -4,39 +4,34 @@ // 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_SupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.h" -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h" +#include "CEC_EventChannel.h" +#include "CEC_SupplierAdmin.h" +#include "CEC_ProxyPushConsumer.h" +#include "CEC_Reactive_SupplierControl.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" -#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" -#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h" +#include "CEC_TypedEventChannel.h" +#include "CEC_TypedSupplierAdmin.h" +#include "CEC_TypedProxyPushConsumer.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h" +#include "CEC_ProxyPullConsumer.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 "ace/Reactor.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i" +#include "CEC_Reactive_SupplierControl.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (CosEvent, CEC_Reactive_SupplierControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_CEC_Reactive_SupplierControl constructor for the Un-typed EC TAO_CEC_Reactive_SupplierControl:: TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate, @@ -49,9 +44,6 @@ TAO_CEC_Reactive_SupplierControl:: 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 @@ -75,7 +67,6 @@ TAO_CEC_Reactive_SupplierControl:: timeout_ (timeout), retries_ (retries), adapter_ (this), - event_channel_ (0), typed_event_channel_ (ec), orb_ (CORBA::ORB::_duplicate (orb)) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -534,4 +525,3 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer ACE_ENDTRY; } -TAO_END_VERSIONED_NAMESPACE_DECL |