1 files changed, 11 insertions, 11 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index 7a5b5d32d8d..73792685a9b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -6,23 +6,23 @@
 #include "PushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_PushConsumer, "$id$")
+ACE_RCSID(Notify, TAO_Notify_PushConsumer, "$id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "orbsvcs/CosEventCommC.h"
 #include "../Event.h"
 
-TAO_NS_PushConsumer::TAO_NS_PushConsumer (TAO_NS_ProxySupplier* proxy)
-  :TAO_NS_Consumer (proxy)
+TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy)
+  :TAO_Notify_Consumer (proxy)
 {
 }
 
-TAO_NS_PushConsumer::~TAO_NS_PushConsumer ()
+TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer ()
 {
 }
 
 void
-TAO_NS_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
 {
   this->push_consumer_ = CosEventComm::PushConsumer::_duplicate (push_consumer);
 
@@ -39,36 +39,36 @@ TAO_NS_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_
 }
 
 void
-TAO_NS_PushConsumer::release (void)
+TAO_Notify_PushConsumer::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_PushConsumer::push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
 {
   this->push_consumer_->push (payload ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_PushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
 {
   CORBA::Any any;
 
-  TAO_NS_Event::translate (event, any);
+  TAO_Notify_Event::translate (event, any);
 
   this->push_consumer_->push (any ACE_ENV_ARG_PARAMETER);
 }