diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp index 6d5b09275b6..92580b14283 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp @@ -1,7 +1,6 @@ // $Id$ #include "SupplierAdmin_i.h" -#include "ace/Auto_Ptr.h" TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i (void) : qos_ (), @@ -26,34 +25,19 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &TAO_IN_ENV) { - CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil = - CosEventChannelAdmin::ProxyPushConsumer::_nil (); - RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer = - this->rtec_supplieradmin_->obtain_push_consumer (ACE_TRY_ENV); - ACE_CHECK_RETURN (proxyconsumer_nil); + this->rtec_supplieradmin_->obtain_push_consumer (TAO_IN_ENV); + TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0); TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer; ACE_NEW_RETURN (proxypushconsumer, TAO_CosEC_ProxyPushConsumer_i (this->qos_, rtecproxypushconsumer.in ()), - proxyconsumer_nil); - auto_ptr <TAO_CosEC_ProxyPushConsumer_i> - auto_proxyconsumer (proxypushconsumer); - - CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj = - auto_proxyconsumer.get ()->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (proxyconsumer_nil); - - // give the ownership to the POA. - auto_proxyconsumer.get ()->_remove_ref (ACE_TRY_ENV); - ACE_CHECK_RETURN (proxyconsumer_nil); - - auto_proxyconsumer.release (); - return proxy_obj; + CosEventChannelAdmin::ProxyPushConsumer::_nil ()); + return proxypushconsumer->_this (TAO_IN_ENV); } CosEventChannelAdmin::ProxyPullConsumer_ptr @@ -62,11 +46,3 @@ TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &) // TODO: implement this. return CosEventChannelAdmin::ProxyPullConsumer::_nil (); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushConsumer_i>; - template class auto_ptr<TAO_CosEC_ProxyPushConsumer_i>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushConsumer_i> -# pragma instantiate auto_ptr<TAO_CosEC_ProxyPushConsumer_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |