1 files changed, 17 insertions, 17 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index 79896de3930..5f8d0fbba15 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_ANYEVENT_H
-#define TAO_NS_ANYEVENT_H
+#ifndef TAO_Notify_ANYEVENT_H
+#define TAO_Notify_ANYEVENT_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -23,29 +23,29 @@
 #include "../EventType.h"
 #include "orbsvcs/CosNotificationC.h"
 
-class TAO_NS_Consumer;
+class TAO_Notify_Consumer;
 
 /**
- * @class TAO_NS_AnyEvent
+ * @class TAO_Notify_AnyEvent
  *
  * @brief
  *
  */
-class TAO_Notify_Export TAO_NS_AnyEvent_No_Copy : public TAO_NS_Event
+class TAO_Notify_Export TAO_Notify_AnyEvent_No_Copy : public TAO_Notify_Event
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 public:
   /// Constuctor
-  TAO_NS_AnyEvent_No_Copy (const CORBA::Any &event);
+  TAO_Notify_AnyEvent_No_Copy (const CORBA::Any &event);
 
   /// Destructor
-  ~TAO_NS_AnyEvent_No_Copy ();
+  ~TAO_Notify_AnyEvent_No_Copy ();
 
   /// Copy the event.
-  virtual TAO_NS_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
+  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
 
   /// Get the event type.
-  virtual const TAO_NS_EventType& type (void) const;
+  virtual const TAO_Notify_EventType& type (void) const;
 
   CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
 
@@ -53,7 +53,7 @@ public:
   virtual void convert (CosNotification::StructuredEvent& notification) const;
 
   /// Push event to consumer
-  virtual void push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const;
+  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
   virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
@@ -72,25 +72,25 @@ protected:
   const CORBA::Any* event_;
 
   /// Our event type.
-  static TAO_NS_EventType event_type_;
+  static TAO_Notify_EventType event_type_;
 };
 
 /*****************************************************************************************************/
 
 /**
- * @class TAO_NS_AnyEvent
+ * @class TAO_Notify_AnyEvent
  *
  * @brief AnyEvent implementation.
  *
  */
-class TAO_Notify_Export TAO_NS_AnyEvent : public TAO_NS_AnyEvent_No_Copy
+class TAO_Notify_Export TAO_Notify_AnyEvent : public TAO_Notify_AnyEvent_No_Copy
 {
 public:
   /// Constuctor
-  TAO_NS_AnyEvent (const CORBA::Any &event);
+  TAO_Notify_AnyEvent (const CORBA::Any &event);
 
   /// Destructor
-  ~TAO_NS_AnyEvent ();
+  ~TAO_Notify_AnyEvent ();
 
 protected:
   /// Copy of the Event.
@@ -102,4 +102,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_ANYEVENT_H */
+#endif /* TAO_Notify_ANYEVENT_H */