1 files changed, 17 insertions, 17 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index 46ea7570770..230e36bdab1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_THREADPOOL_TASK_H
-#define TAO_NS_THREADPOOL_TASK_H
+#ifndef TAO_Notify_THREADPOOL_TASK_H
+#define TAO_Notify_THREADPOOL_TASK_H
 #include "ace/pre.h"
 
 #include "notify_export.h"
@@ -25,25 +25,25 @@
 #include "AdminProperties.h"
 #include "Worker_Task.h"
 
-class TAO_NS_Buffering_Strategy;
-class TAO_NS_Timer_Queue;
+class TAO_Notify_Buffering_Strategy;
+class TAO_Notify_Timer_Queue;
 
 /**
- * @class TAO_NS_ThreadPool_Task
+ * @class TAO_Notify_ThreadPool_Task
  *
  * @brief Implements a Thread Pool Worker Task.
  *
  */
-class TAO_Notify_Export TAO_NS_ThreadPool_Task : public TAO_NS_Worker_Task, ACE_Task<ACE_NULL_SYNCH>
+class TAO_Notify_Export TAO_Notify_ThreadPool_Task : public TAO_Notify_Worker_Task, ACE_Task<ACE_NULL_SYNCH>
 {
-  friend class TAO_NS_Method_Request_Shutdown;
+  friend class TAO_Notify_Method_Request_Shutdown;
 
 public:
   /// Constuctor
-  TAO_NS_ThreadPool_Task (void);
+  TAO_Notify_ThreadPool_Task (void);
 
   /// Destructor
-  ~TAO_NS_ThreadPool_Task ();
+  ~TAO_Notify_ThreadPool_Task ();
 
   /// Call the base class init
   virtual int init (int argc, char **argv);
@@ -54,22 +54,22 @@ public:
   virtual void release (void);
 
   /// Activate the threadpool
-  void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_NS_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
+  void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_Notify_AdminProperties_var& admin_properties ACE_ENV_ARG_DECL);
 
   /// Queue the request
-  virtual void execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL);
 
   /// Shutdown task
   virtual void shutdown (void);
 
   /// Update QoS Properties.
-  virtual void update_qos_properties (const TAO_NS_QoSProperties& qos_properties);
+  virtual void update_qos_properties (const TAO_Notify_QoSProperties& qos_properties);
 
   /// The object used by clients to register timers.
-  virtual TAO_NS_Timer* timer (void);
+  virtual TAO_Notify_Timer* timer (void);
 
   /// Access the Buffering Strategy.
-  TAO_NS_Buffering_Strategy* buffering_strategy (void);
+  TAO_Notify_Buffering_Strategy* buffering_strategy (void);
 
 protected:
     /// task svc
@@ -77,13 +77,13 @@ protected:
 
 private:
   /// The buffering strategy to use.
-  TAO_NS_Buffering_Strategy* buffering_strategy_;
+  TAO_Notify_Buffering_Strategy* buffering_strategy_;
 
   /// Shutdown
   int shutdown_;
 
   /// The Queue based timer.
-  TAO_NS_Timer_Queue* timer_;
+  TAO_Notify_Timer_Queue* timer_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -91,4 +91,4 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_THREADPOOL_TASK_H */
+#endif /* TAO_Notify_THREADPOOL_TASK_H */