diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h index 5784e15ed91..96b16b6f384 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h @@ -24,15 +24,9 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/CosEventChannelAdminS.h" -#if defined(_MSC_VER) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_CosEC_PushSupplierWrapper; -class TAO_ORBSVCS_Export TAO_CosEC_ProxyPushConsumer_i : - public virtual POA_CosEventChannelAdmin::ProxyPushConsumer, - public virtual PortableServer::RefCountServantBase +class TAO_ORBSVCS_Export TAO_CosEC_ProxyPushConsumer_i : public POA_CosEventChannelAdmin::ProxyPushConsumer { // = TITLE // class TAO_CosEC_ProxyPushConsumer_i implements the ProxyPushConsumer @@ -50,21 +44,21 @@ class TAO_ORBSVCS_Export TAO_CosEC_ProxyPushConsumer_i : public: // = Initialization and termination methods. TAO_CosEC_ProxyPushConsumer_i (const RtecEventChannelAdmin::SupplierQOS &qos, - RtecEventChannelAdmin::ProxyPushConsumer_ptr proxypushconsumer); + RtecEventChannelAdmin::ProxyPushConsumer_ptr ppc); // Constructor. ~TAO_CosEC_ProxyPushConsumer_i (void); // Destructor. virtual void push (const CORBA::Any &data, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Environment &TAO_IN_ENV); // Suppliers call this method to pass data to connected consumers. - virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV); + virtual void disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV); // Disconnects the supplier from the event communication. virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Environment &TAO_IN_ENV); // Connects a push supplier. private: @@ -75,15 +69,11 @@ private: const RtecEventChannelAdmin::SupplierQOS &qos_; // The SupplierQOS specified by the user of this class. - RtecEventChannelAdmin::ProxyPushConsumer_var proxypushconsumer_; + RtecEventChannelAdmin::ProxyPushConsumer_var ppc_; // The Rtec ProxyPushConsumer specified by the user of this class. TAO_CosEC_PushSupplierWrapper *wrapper_; // The Rtec PushSupplier wrapper used by the Rtec ProxyPushConsumer. }; -#if defined(_MSC_VER) -#pragma warning(default:4250) -#endif /* _MSC_VER */ - #endif /* _PROXYPUSHCONSUMER_I_H */ |