1 files changed, 41 insertions, 41 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index efc8b257831..24c13603671 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_EVENT_MANAGER_H
-#define TAO_NS_EVENT_MANAGER_H
+#ifndef TAO_Notify_EVENT_MANAGER_H
+#define TAO_Notify_EVENT_MANAGER_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -21,28 +21,28 @@
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 
-class TAO_NS_ProxySupplier;
-class TAO_NS_ProxyConsumer;
-class TAO_NS_EventTypeSeq;
+class TAO_Notify_ProxySupplier;
+class TAO_Notify_ProxyConsumer;
+class TAO_Notify_EventTypeSeq;
 
-template <class PROXY, class ACE_LOCK> class TAO_NS_Event_Map_T;
-typedef TAO_NS_Event_Map_T<TAO_NS_ProxySupplier, TAO_SYNCH_RW_MUTEX> TAO_NS_Consumer_Map;
-typedef TAO_NS_Event_Map_T<TAO_NS_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_NS_Supplier_Map;
+template <class PROXY, class ACE_LOCK> class TAO_Notify_Event_Map_T;
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, TAO_SYNCH_RW_MUTEX> TAO_Notify_Consumer_Map;
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_Notify_Supplier_Map;
 
 /**
- * @class TAO_NS_Event_Manager
+ * @class TAO_Notify_Event_Manager
  *
  * @brief A class that manages the Consumer and Supplier maps.
  *
  */
-class TAO_Notify_Export TAO_NS_Event_Manager
+class TAO_Notify_Export TAO_Notify_Event_Manager
 {
 public:
   /// Constuctor
-  TAO_NS_Event_Manager (void);
+  TAO_Notify_Event_Manager (void);
 
   /// Destructor
-  ~TAO_NS_Event_Manager ();
+  ~TAO_Notify_Event_Manager ();
 
   /// Init
   void init (ACE_ENV_SINGLE_ARG_DECL);
@@ -51,93 +51,93 @@ public:
   void shutdown (void);
 
   /// Connect ProxySupplier
-  void connect (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  void connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
 
   /// Disconnect ProxySupplier
-  void disconnect (TAO_NS_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  void disconnect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
 
   /// Connect ProxyConsumer
-  void connect (TAO_NS_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
+  void connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
 
   /// Disconnect ProxyConsumer
-  void disconnect (TAO_NS_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
+  void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
 
   /// Map accessors.
-  TAO_NS_Consumer_Map* consumer_map (void);
-  TAO_NS_Supplier_Map* supplier_map (void);
+  TAO_Notify_Consumer_Map* consumer_map (void);
+  TAO_Notify_Supplier_Map* supplier_map (void);
 
   /// Offer change received on <proxy_consumer>.
-  void offer_change (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
 
   /// Subscription change received on <proxy_supplier>.
-  void subscription_change (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
 
   /// What are the types being offered.
-  const TAO_NS_EventTypeSeq& offered_types (void);
+  const TAO_Notify_EventTypeSeq& offered_types (void);
 
   /// What are the types being subscribed.
-  const TAO_NS_EventTypeSeq& subscription_types (void);
+  const TAO_Notify_EventTypeSeq& subscription_types (void);
 
 protected:
   /// Subscribe <proxy_supplier> to the event type sequence list <seq>.
-  void subscribe (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
+  void subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
 
   /// Unsubscribe <proxy_supplier> to the event type sequence list <seq>.
-  void un_subscribe (TAO_NS_ProxySupplier* proxy_supplier, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
+  void un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
 
   /// Subscribe <proxy_consumer> to the event type sequence list <seq>.
-  void publish (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
+  void publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
 
   /// Subscribe <proxy_consumer> to the event type sequence list <seq>.
-  void un_publish (TAO_NS_ProxyConsumer* proxy_consumer, const TAO_NS_EventTypeSeq& seq, TAO_NS_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
+  void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
 
   /// Consumer Map
-  TAO_NS_Consumer_Map* consumer_map_;
+  TAO_Notify_Consumer_Map* consumer_map_;
 
   /// Supplier Map
-  TAO_NS_Supplier_Map* supplier_map_;
+  TAO_Notify_Supplier_Map* supplier_map_;
 };
 
 /********************************************************************************/
 
 /**
- * @class TAO_NS_ProxyConsumer_Update_Worker
+ * @class TAO_Notify_ProxyConsumer_Update_Worker
  *
  * @brief Inform ProxyConsumer of updates.
  *
  */
-class TAO_Notify_Export TAO_NS_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_NS_ProxyConsumer>
+class TAO_Notify_Export TAO_Notify_ProxyConsumer_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxyConsumer>
 {
 public:
-  TAO_NS_ProxyConsumer_Update_Worker (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed);
+  TAO_Notify_ProxyConsumer_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TAO_NS_ProxyConsumer* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL);
 
-  const TAO_NS_EventTypeSeq& added_;
-  const TAO_NS_EventTypeSeq& removed_;
+  const TAO_Notify_EventTypeSeq& added_;
+  const TAO_Notify_EventTypeSeq& removed_;
 };
 
 /********************************************************************************/
 
 /**
- * @class TAO_NS_ProxySupplier_Update_Worker
+ * @class TAO_Notify_ProxySupplier_Update_Worker
  *
  * @brief Inform ProxySupplier of updates.
  *
  */
-class TAO_Notify_Export TAO_NS_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_NS_ProxySupplier>
+class TAO_Notify_Export TAO_Notify_ProxySupplier_Update_Worker : public TAO_ESF_Worker<TAO_Notify_ProxySupplier>
 {
 public:
-  TAO_NS_ProxySupplier_Update_Worker (const TAO_NS_EventTypeSeq& added, const TAO_NS_EventTypeSeq& removed);
+  TAO_Notify_ProxySupplier_Update_Worker (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TAO_NS_ProxySupplier* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL);
 
-  const TAO_NS_EventTypeSeq& added_;
-  const TAO_NS_EventTypeSeq& removed_;
+  const TAO_Notify_EventTypeSeq& added_;
+  const TAO_Notify_EventTypeSeq& removed_;
 };
 
 /********************************************************************************/
@@ -147,4 +147,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_EVENT_MANAGER_H */
+#endif /* TAO_Notify_EVENT_MANAGER_H */