diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h index 05596522e5f..e44087e7c4a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h @@ -26,13 +26,7 @@ #include "orbsvcs/CosEvent/ConsumerAdmin_i.h" #include "orbsvcs/CosEvent/SupplierAdmin_i.h" -#if defined(_MSC_VER) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -class TAO_ORBSVCS_Export TAO_CosEC_EventChannel_i : -public virtual POA_CosEventChannelAdmin::EventChannel, -public virtual PortableServer::RefCountServantBase +class TAO_ORBSVCS_Export TAO_CosEC_EventChannel_i : public POA_CosEventChannelAdmin::EventChannel { // = TITLE // class TAO_CosEC_EventChannel_i implements the standard Cos EventChannel @@ -55,29 +49,29 @@ public: int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos, const RtecEventChannelAdmin::SupplierQOS &supplierqos, RtecEventChannelAdmin::EventChannel_ptr rtec, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Environment &TAO_IN_ENV); // Activates the ConsumerAdmin and SupplierAdmin servants. Returns // -1 on error, 0 on success. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV); + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &TAO_IN_ENV); // The for_consumers method will return the same ConsumerAdmin_ptr // everytime its called. - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV); + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &TAO_IN_ENV); // The for_suppliers method will return the same SupplierAdmin_ptr // everytime its called. - virtual void destroy (CORBA::Environment &ACE_TRY_ENV); + virtual void destroy (CORBA::Environment &TAO_IN_ENV); // Destroys this Event Channel object. - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (CORBA::Environment &TAO_IN_ENV); // destroys this Event Channel object and <delete>s this object. private: - TAO_CosEC_ConsumerAdmin_i* consumer_admin_; + TAO_CosEC_ConsumerAdmin_i consumer_admin_; // ConsumerAdmin servant object. - TAO_CosEC_SupplierAdmin_i* supplier_admin_; + TAO_CosEC_SupplierAdmin_i supplier_admin_; // SupplierAdmin servant object. CosEventChannelAdmin::ConsumerAdmin_var consumeradmin_; @@ -89,8 +83,4 @@ private: // activating the servant in the ORB. }; -#if defined(_MSC_VER) -#pragma warning(default:4250) -#endif /* _MSC_VER */ - #endif /* EVENTCHANNEL_I_H */ |