1 files changed, 14 insertions, 14 deletions

diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index eaea60be1c8..8baf36acadc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -8,29 +8,29 @@ ACE_RCSID(lib, TAO_SupplierAdmin_Command, "$id$")
 #include "Name.h"
 #include "Options_Parser.h"
 
-TAO_NS_SupplierAdmin_Command::TAO_NS_SupplierAdmin_Command (void)
+TAO_Notify_Tests_SupplierAdmin_Command::TAO_Notify_Tests_SupplierAdmin_Command (void)
 : ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0)
 {
 }
 
-TAO_NS_SupplierAdmin_Command::~TAO_NS_SupplierAdmin_Command ()
+TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command ()
 {
 }
 
 const char*
-TAO_NS_SupplierAdmin_Command::get_name (void)
+TAO_Notify_Tests_SupplierAdmin_Command::get_name (void)
 {
-  return TAO_NS_SupplierAdmin_Command::name ();
+  return TAO_Notify_Tests_SupplierAdmin_Command::name ();
 }
 
 const char*
-TAO_NS_SupplierAdmin_Command::name (void)
+TAO_Notify_Tests_SupplierAdmin_Command::name (void)
 {
-  return TAO_NS_Name::supplier_admin_command;
+  return TAO_Notify_Tests_Name::supplier_admin_command;
 }
 
 void
-TAO_NS_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -70,7 +70,7 @@ TAO_NS_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
           this->name_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser options_parser;
+          TAO_Notify_Tests_Options_Parser options_parser;
           options_parser.execute (this->added_, this->removed_, arg_shifter);
         } // Subscription
       else if (arg_shifter.cur_arg_strncasecmp ("-Set_QoS") == 0) // -Set_QoS ec_name [Qos Options]
@@ -83,14 +83,14 @@ TAO_NS_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 
           arg_shifter.consume_arg ();
 
-          TAO_NS_Options_Parser qos_parser;
+          TAO_Notify_Tests_Options_Parser qos_parser;
           qos_parser.execute (this->qos_, arg_shifter);
         }
     } /* if */
 }
 
 void
-TAO_NS_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
@@ -109,7 +109,7 @@ TAO_NS_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
@@ -137,12 +137,12 @@ TAO_NS_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SupplierAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_NS_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
@@ -154,7 +154,7 @@ TAO_NS_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_SupplierAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->command_ == CREATE)
     {