ChangeLogTag:Tue Dec 04 20:08:49 2001 Nanbor Wang <nanbor@cs.wustl.edu>

3 files changed, 33 insertions, 33 deletions

diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index 2df1e540275..72c7e9b8494 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -34,7 +34,7 @@ public:
   void list_options (void);
   // Print name options
 
-  int bind (const char *key, 
+  int bind (const char *key,
             const char *value,
             const char *type = "");
   // Bind a key to a value
@@ -129,8 +129,8 @@ Client_Test::open (void)
   this->display_menu ();
 
   if (ACE_Event_Handler::register_stdin_handler (this,
-						 ACE_Reactor::instance (),
-						 ACE_Thread_Manager::instance ()) == -1)
+                                                 ACE_Reactor::instance (),
+                                                 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "register_stdin_handler"),
@@ -438,7 +438,7 @@ Client_Test::unbind (const char *key)
 }
 
 int
-Client_Test::rebind (const char *key, 
+Client_Test::rebind (const char *key,
                      const char *value,
                      const char *type)
 {
@@ -460,7 +460,7 @@ Client_Test::list_names (const char *pattern)
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
 
-      for (ACE_WString *name = 0;
+      for (ACE_NS_WString *name = 0;
            set_iterator.next (name) !=0;
            set_iterator.advance())
         ACE_DEBUG ((LM_DEBUG,
@@ -484,7 +484,7 @@ Client_Test::list_values (const char *pattern)
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
 
-      for (ACE_WString *value = 0;
+      for (ACE_NS_WString *value = 0;
            set_iterator.next (value) !=0;
            set_iterator.advance())
         ACE_DEBUG ((LM_DEBUG,
@@ -508,7 +508,7 @@ Client_Test::list_types (const char *pattern)
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
 
-      for (ACE_WString *type = 0;
+      for (ACE_NS_WString *type = 0;
            set_iterator.next (type) !=0;
            set_iterator.advance())
         ACE_DEBUG ((LM_DEBUG,
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index e8d50e221e4..bfa2eb7c591 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -374,10 +374,10 @@ int
 ACE_Name_Handler::shared_bind (int rebind)
 {
   ACE_TRACE ("ACE_Name_Handler::shared_bind");
-  ACE_WString a_name (this->name_request_.name (),
-                      this->name_request_.name_len () / sizeof (ACE_USHORT16));
-  ACE_WString a_value (this->name_request_.value (),
-                       this->name_request_.value_len () / sizeof (ACE_USHORT16));
+  ACE_NS_WString a_name (this->name_request_.name (),
+                         this->name_request_.name_len () / sizeof (ACE_USHORT16));
+  ACE_NS_WString a_value (this->name_request_.value (),
+                          this->name_request_.value_len () / sizeof (ACE_USHORT16));
   int result;
   if (rebind == 0)
     {
@@ -414,13 +414,13 @@ ACE_Name_Handler::resolve (void)
 #if 0
   ACE_DEBUG ((LM_DEBUG, "request for RESOLVE \n"));
 #endif /* 0 */
-  ACE_WString a_name (this->name_request_.name (),
-                      this->name_request_.name_len () / sizeof (ACE_USHORT16));
+  ACE_NS_WString a_name (this->name_request_.name (),
+                         this->name_request_.name_len () / sizeof (ACE_USHORT16));
 
   // The following will deliver our reply back to client we
   // pre-suppose success (indicated by type RESOLVE).
 
-  ACE_WString avalue;
+  ACE_NS_WString avalue;
   char *atype;
   if (NAMING_CONTEXT::instance ()->resolve (a_name, avalue, atype) == 0)
     {
@@ -447,8 +447,8 @@ ACE_Name_Handler::unbind (void)
 #if 0
   ACE_DEBUG ((LM_DEBUG, "request for UNBIND \n"));
 #endif /* 0 */
-  ACE_WString a_name (this->name_request_.name (),
-                      this->name_request_.name_len () / sizeof (ACE_USHORT16));
+  ACE_NS_WString a_name (this->name_request_.name (),
+                         this->name_request_.name_len () / sizeof (ACE_USHORT16));
 
   if (NAMING_CONTEXT::instance ()->unbind (a_name) == 0)
     return this->send_reply (0);
@@ -457,7 +457,7 @@ ACE_Name_Handler::unbind (void)
 }
 
 ACE_Name_Request
-ACE_Name_Handler::name_request (ACE_WString *one_name)
+ACE_Name_Handler::name_request (ACE_NS_WString *one_name)
 {
   ACE_TRACE ("ACE_Name_Handler::name_request");
   ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> one_name_urep (one_name->ushort_rep ());
@@ -469,7 +469,7 @@ ACE_Name_Handler::name_request (ACE_WString *one_name)
 }
 
 ACE_Name_Request
-ACE_Name_Handler::value_request (ACE_WString *one_value)
+ACE_Name_Handler::value_request (ACE_NS_WString *one_value)
 {
   ACE_TRACE ("ACE_Name_Handler::value_request");
   ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> one_value_urep (one_value->ushort_rep ());
@@ -481,7 +481,7 @@ ACE_Name_Handler::value_request (ACE_WString *one_value)
 }
 
 ACE_Name_Request
-ACE_Name_Handler::type_request (ACE_WString *one_type)
+ACE_Name_Handler::type_request (ACE_NS_WString *one_type)
 {
   ACE_TRACE ("ACE_Name_Handler::type_request");
   return ACE_Name_Request (ACE_Name_Request::LIST_TYPES,
@@ -497,8 +497,8 @@ ACE_Name_Handler::lists (void)
   ACE_TRACE ("ACE_Name_Handler::lists");
 
   ACE_PWSTRING_SET set;
-  ACE_WString pattern (this->name_request_.name (),
-                       this->name_request_.name_len () / sizeof (ACE_USHORT16));
+  ACE_NS_WString pattern (this->name_request_.name (),
+                          this->name_request_.name_len () / sizeof (ACE_USHORT16));
 
   // Get the index into the list table
   int index = ACE_LIST_MAP (this->name_request_.msg_type (),
@@ -518,9 +518,9 @@ ACE_Name_Handler::lists (void)
     }
   else
     {
-      ACE_WString *one_entry = 0;
+      ACE_NS_WString *one_entry = 0;
 
-      for (ACE_Unbounded_Set_Iterator<ACE_WString> set_iterator (set);
+      for (ACE_Unbounded_Set_Iterator<ACE_NS_WString> set_iterator (set);
            set_iterator.next (one_entry) !=0;
            set_iterator.advance())
         {
@@ -547,8 +547,8 @@ ACE_Name_Handler::lists_entries (void)
 {
   ACE_TRACE ("ACE_Name_Handler::lists_entries");
   ACE_BINDING_SET set;
-  ACE_WString pattern (this->name_request_.name (),
-                       this->name_request_.name_len () / sizeof (ACE_USHORT16));
+  ACE_NS_WString pattern (this->name_request_.name (),
+                          this->name_request_.name_len () / sizeof (ACE_USHORT16));
 
   int result = -1;
 
@@ -598,9 +598,9 @@ ACE_Name_Handler::lists_entries (void)
            set_iterator.next (one_entry) !=0;
            set_iterator.advance())
         {
-           ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> 
+           ACE_Auto_Basic_Array_Ptr<ACE_USHORT16>
              name_urep (one_entry->name_.ushort_rep ());
-           ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> 
+           ACE_Auto_Basic_Array_Ptr<ACE_USHORT16>
              value_urep (one_entry->value_.ushort_rep ());
            ACE_Name_Request mynrq (this->name_request_.msg_type (),
                                   name_urep.get (),
diff --git a/netsvcs/lib/Name_Handler.h b/netsvcs/lib/Name_Handler.h
index e1ec4b9ee5b..cf01cd98a38 100644
--- a/netsvcs/lib/Name_Handler.h
+++ b/netsvcs/lib/Name_Handler.h
@@ -32,7 +32,7 @@
 class Naming_Context : public ACE_Naming_Context
 {
   // = TITLE
-  // 
+  //
   //   This helper class adds the correct default constructor to the
   //   <ACE_Naming_Context> class so that we can use it in
   //   <ACE_Singleton>.
@@ -62,10 +62,10 @@ public:
   typedef int (ACE_Name_Handler::*OPERATION) (void);
   // Pointer to a member function of ACE_Name_Handler returning int
 
-  typedef int (ACE_Naming_Context::*LIST_OP) (ACE_PWSTRING_SET &, const ACE_WString &);
+  typedef int (ACE_Naming_Context::*LIST_OP) (ACE_PWSTRING_SET &, const ACE_NS_WString &);
   // Pointer to a member function of ACE_Naming_Context returning int
 
-  typedef ACE_Name_Request (ACE_Name_Handler::*REQUEST) (ACE_WString *);
+  typedef ACE_Name_Request (ACE_Name_Handler::*REQUEST) (ACE_NS_WString *);
   // Pointer to a member function of ACE_Name_Handler returning ACE_Name_Request
 
   // = Initialization and termination.
@@ -173,13 +173,13 @@ private:
   // Handle LIST_NAME_ENTRIES, LIST_VALUE_ENTRIES, and
   // LIST_TYPE_ENTRIES requests.
 
-  ACE_Name_Request name_request (ACE_WString *one_name);
+  ACE_Name_Request name_request (ACE_NS_WString *one_name);
   // Create a name request.
 
-  ACE_Name_Request value_request (ACE_WString *one_name);
+  ACE_Name_Request value_request (ACE_NS_WString *one_name);
   // Create a value request.
 
-  ACE_Name_Request type_request (ACE_WString *one_name);
+  ACE_Name_Request type_request (ACE_NS_WString *one_name);
   // Create a type request.
 };