diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h index 4bb1d866953..c18dbf08717 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h @@ -25,13 +25,7 @@ #include "orbsvcs/CosEventChannelAdminC.h" #include "orbsvcs/CosEvent/ProxyPushConsumer_i.h" -#if defined(_MSC_VER) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -class TAO_ORBSVCS_Export TAO_CosEC_SupplierAdmin_i : - public virtual POA_CosEventChannelAdmin::SupplierAdmin, - public virtual PortableServer::RefCountServantBase +class TAO_ORBSVCS_Export TAO_CosEC_SupplierAdmin_i : public POA_CosEventChannelAdmin::SupplierAdmin { // = TITLE // class TAO_CosEC_SupplierAdmin_i implements the SupplierAdmin interface. @@ -53,11 +47,11 @@ public: // error. virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV); + obtain_push_consumer (CORBA::Environment &TAO_IN_ENV); // Returns a new ProxyPushConsumer_ptr. virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer(CORBA::Environment &ACE_TRY_ENV); + obtain_pull_consumer(CORBA::Environment &TAO_IN_ENV); // Returns a new ProxyPullConsumer_ptr. private: @@ -69,8 +63,4 @@ private: // this class. }; -#if defined(_MSC_VER) -#pragma warning(default:4250) -#endif /* _MSC_VER */ - #endif /* SUPPLIER_ADMIN_I_H */ |