diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Admin.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Admin.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index ec510943c8f..58613798b26 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -5,7 +5,7 @@ #include "Admin.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Notify, TAO_NS_Admin, "$Id$") +ACE_RCSID(Notify, TAO_Notify_Admin, "$Id$") #include "orbsvcs/CosNotifyChannelAdminC.h" @@ -13,32 +13,32 @@ ACE_RCSID(Notify, TAO_NS_Admin, "$Id$") #include "Proxy.h" #include "EventChannel.h" -TAO_NS_Admin::TAO_NS_Admin (void) +TAO_Notify_Admin::TAO_Notify_Admin (void) : ec_ (0) , proxy_container_ (0) , filter_operator_ (CosNotifyChannelAdmin::OR_OP) { // Initialize all Admin objects to initially be subscribed for all events. // This is a reasonable default and is required to allow Cos Event consumers/suppliers to send/receive events, - this->subscribed_types_.insert (TAO_NS_EventType::special ()); + this->subscribed_types_.insert (TAO_Notify_EventType::special ()); } -TAO_NS_Admin::~TAO_NS_Admin () +TAO_Notify_Admin::~TAO_Notify_Admin () { this->ec_->_decr_refcnt (); } void -TAO_NS_Admin::init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL) +TAO_Notify_Admin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL) { this->ec_ = ec; this->ec_->_incr_refcnt (); - this->TAO_NS_Object::init (ec); + this->TAO_Notify_Object::init (ec); ACE_NEW_THROW_EX (this->proxy_container_, - TAO_NS_Proxy_Container (), + TAO_Notify_Proxy_Container (), CORBA::INTERNAL ()); ACE_CHECK; @@ -48,14 +48,14 @@ TAO_NS_Admin::init (TAO_NS_EventChannel *ec ACE_ENV_ARG_DECL) } void -TAO_NS_Admin::remove (TAO_NS_Proxy* proxy ACE_ENV_ARG_DECL) +TAO_Notify_Admin::remove (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL) { this->proxy_container_->remove (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_NS_Admin::subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL) +TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -66,9 +66,9 @@ TAO_NS_Admin::subscribed_types (TAO_NS_EventTypeSeq& subscribed_types ACE_ENV_AR } int -TAO_NS_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - if (TAO_NS_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) + if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1) return 1; this->proxy_container_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -80,19 +80,19 @@ TAO_NS_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_NS_Admin::insert (TAO_NS_Proxy* proxy ACE_ENV_ARG_DECL) +TAO_Notify_Admin::insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL) { this->proxy_container_->insert (proxy ACE_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy>; -template class TAO_NS_Container_T <TAO_NS_Proxy>; +template class TAO_ESF_Shutdown_Proxy<TAO_Notify_Proxy>; +template class TAO_Notify_Container_T <TAO_Notify_Proxy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy> -#pragma instantiate TAO_NS_Container_T <TAO_NS_Proxy> +#pragma TAO_ESF_Shutdown_Proxy<TAO_Notify_Proxy> +#pragma instantiate TAO_Notify_Container_T <TAO_Notify_Proxy> #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |