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

1 files changed, 20 insertions, 20 deletions

diff --git a/ace/Name_Space.h b/ace/Name_Space.h
index 839179af741..d4e461750a8 100644
--- a/ace/Name_Space.h
+++ b/ace/Name_Space.h
@@ -25,7 +25,7 @@
 #include "ace/Unbounded_Set.h"
 #include "ace/Name_Proxy.h"
 
-typedef ACE_Unbounded_Set<ACE_WString> ACE_WSTRING_SET;
+typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
 
 /**
  * @class ACE_Name_Binding
@@ -37,8 +37,8 @@ class ACE_Export ACE_Name_Binding
 public:
   // = Initialization and termination.
   /// Main constructor that initializes all the fields.
-  ACE_Name_Binding (const ACE_WString &n,
-                    const ACE_WString &v,
+  ACE_Name_Binding (const ACE_NS_WString &n,
+                    const ACE_NS_WString &v,
                     const char *t);
 
   /// Default constructor.
@@ -57,10 +57,10 @@ public:
   int operator == (const ACE_Name_Binding &s) const;
 
   /// Name of the binding.
-  ACE_WString name_;
+  ACE_NS_WString name_;
 
   /// Value of the binding.
-  ACE_WString value_;
+  ACE_NS_WString value_;
 
   /// Type of the binding.
   char *type_;
@@ -69,8 +69,8 @@ public:
 typedef ACE_Unbounded_Set<ACE_Name_Binding> ACE_BINDING_SET;
 typedef ACE_Unbounded_Set_Iterator<ACE_Name_Binding> ACE_BINDING_ITERATOR;
 
-typedef ACE_Unbounded_Set<ACE_WString> ACE_PWSTRING_SET;
-typedef ACE_Unbounded_Set_Iterator<ACE_WString> ACE_PWSTRING_ITERATOR;
+typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_PWSTRING_SET;
+typedef ACE_Unbounded_Set_Iterator<ACE_NS_WString> ACE_PWSTRING_ITERATOR;
 
 /**
  * @class ACE_Name_Space
@@ -90,8 +90,8 @@ public:
   virtual ~ACE_Name_Space (void);
 
   /// Bind a new name to a naming context (Wide character strings).
-  virtual int bind (const ACE_WString &name_in,
-                    const ACE_WString &value_in,
+  virtual int bind (const ACE_NS_WString &name_in,
+                    const ACE_NS_WString &value_in,
                     const char *type_in = "") = 0;
 
 
@@ -100,34 +100,34 @@ public:
    * ACE_Name_Space or bind a new name to the context, if it didn't
    * exist yet. (Wide charcter strings interface).
    */
-  virtual int rebind (const ACE_WString &name_in,
-                      const ACE_WString &value_in,
+  virtual int rebind (const ACE_NS_WString &name_in,
+                      const ACE_NS_WString &value_in,
                       const char *type_in = "") = 0;
 
   /// Delete a name from a ACE_Name_Space (Wide charcter strings
   /// Interface).
-  virtual int unbind (const ACE_WString &name_in) = 0;
+  virtual int unbind (const ACE_NS_WString &name_in) = 0;
 
   /// Get value and type of a given name binding (Wide chars).  The
   /// caller is responsible for deleting both <value_out> and <type_out>!
-  virtual int resolve (const ACE_WString &name_in,
-                       ACE_WString &value_out,
+  virtual int resolve (const ACE_NS_WString &name_in,
+                       ACE_NS_WString &value_out,
                        char *&type_out) = 0;
 
   /// Get a set of names matching a specified pattern (wchars). Matching
   /// means the names must begin with the pattern string.
   virtual int list_names (ACE_WSTRING_SET &set_out,
-                          const ACE_WString &pattern_in) = 0;
+                          const ACE_NS_WString &pattern_in) = 0;
 
   /// Get a set of values matching a specified pattern (wchars). Matching
   /// means the values must begin with the pattern string.
   virtual int list_values (ACE_WSTRING_SET &set_out,
-                           const ACE_WString &pattern_in) = 0;
+                           const ACE_NS_WString &pattern_in) = 0;
 
   /// Get a set of types matching a specified pattern (wchars). Matching
   /// means the types must begin with the pattern string.
   virtual int list_types (ACE_WSTRING_SET &set_out,
-                          const ACE_WString &pattern_in) = 0;
+                          const ACE_NS_WString &pattern_in) = 0;
 
   /**
    * Get a set of names matching a specified pattern (wchars). Matching
@@ -135,7 +135,7 @@ public:
    * complete binding associated each pattern match.
    */
   virtual int list_name_entries (ACE_BINDING_SET &set,
-                                 const ACE_WString &pattern) = 0;
+                                 const ACE_NS_WString &pattern) = 0;
 
   /**
    * Get a set of values matching a specified pattern (wchars). Matching
@@ -143,7 +143,7 @@ public:
    * complete binding associated each pattern match.
    */
   virtual int list_value_entries (ACE_BINDING_SET &set,
-                                  const ACE_WString &pattern) = 0;
+                                  const ACE_NS_WString &pattern) = 0;
 
   /**
    * Get a set of types matching a specified pattern (wchars). Matching
@@ -151,7 +151,7 @@ public:
    * complete binding associated each pattern match.
    */
   virtual int list_type_entries (ACE_BINDING_SET &set,
-                                 const ACE_WString &pattern) = 0;
+                                 const ACE_NS_WString &pattern) = 0;
 
   /// Dump the state of the object
   virtual void dump (void) const = 0;