ChangeLogTag:Thu Apr 17 08:23:19 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

5 files changed, 102 insertions, 94 deletions

diff --git a/ChangeLog b/ChangeLog
index fa80de2aa51..a0d6834a595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@ Thu Apr 17 08:23:19 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 	* ace/Local_Name_Space.h (ACE_NS_String):
 	* ace/Local_Name_Space.cpp (ACE_NS_String):
 	* ace/Local_Name_Space_T.cpp (shared_rebind_i):
+	* ace/Name_Request_Reply.h:
+	* ace/Name_Request_Reply.cpp:
+	* ace/Remote_Name_Space.cpp:
+	* netsvcs/lib/Name_Handler.cpp:
 
 	  The underlying string is now an ACE_WCHAR_T instead of an
 	  ACE_USHORT16.  Not all platforms represent wide characters with
diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp
index 078e5ec9d37..03928be00c7 100644
--- a/ace/Name_Request_Reply.cpp
+++ b/ace/Name_Request_Reply.cpp
@@ -1,9 +1,12 @@
-// $Id$
-
 #include "ace/Name_Request_Reply.h"
 #include "ace/Log_Msg.h"
+#include "ace/Time_Value.h"
+
+
+ACE_RCSID (ace,
+           Name_Request_Reply,
+           "$Id$")
 
-ACE_RCSID(ace, Name_Request_Reply, "$Id$")
 
 // Default "do nothing" constructor.
 
@@ -14,14 +17,15 @@ ACE_Name_Request::ACE_Name_Request (void)
 
 // Create a ACE_Name_Request message.
 
-ACE_Name_Request::ACE_Name_Request (ACE_INT32 t, // Type of request.
-                                    const ACE_USHORT16 name[], // Name
-                                    const ACE_UINT32 name_length, // size in bytes
-                                    const ACE_USHORT16 value[], //
-                                    const ACE_UINT32 value_length, // size in bytes
-                                    const char type[], //
-                                    const ACE_UINT32 type_length, // size in bytes
-                                    ACE_Time_Value *timeout) // Max time waiting for request.
+ACE_Name_Request::ACE_Name_Request (
+  ACE_INT32 t, // Type of request.
+  const ACE_WCHAR_T name[], // Name
+  const ACE_UINT32 name_length, // size in bytes
+  const ACE_WCHAR_T value[], //
+  const ACE_UINT32 value_length, // size in bytes
+  const char type[], //
+  const ACE_UINT32 type_length, // size in bytes
+  ACE_Time_Value *timeout) // Max time waiting for request.
 {
   ACE_TRACE ("ACE_Name_Request::ACE_Name_Request");
   this->msg_type (t);
@@ -46,8 +50,8 @@ ACE_Name_Request::ACE_Name_Request (ACE_INT32 t, // Type of request.
 
   // Set up pointers and copy name value and type into request.
   this->name_ = this->transfer_.data_;
-  this->value_  = &this->name_[name_length / sizeof (ACE_USHORT16) ];
-  this->type_  = (char *)(&this->value_[value_length / sizeof (ACE_USHORT16)]); //
+  this->value_  = &this->name_[name_length / sizeof (ACE_WCHAR_T) ];
+  this->type_  = (char *)(&this->value_[value_length / sizeof (ACE_WCHAR_T)]); //
 
   (void) ACE_OS::memcpy (this->name_,
                          name,
@@ -193,7 +197,7 @@ ACE_Name_Request::timeout (const ACE_Time_Value timeout)
 
 // = Set/get the name
 
-const ACE_USHORT16 *
+const ACE_WCHAR_T *
 ACE_Name_Request::name (void) const
 {
   ACE_TRACE ("ACE_Name_Request::name");
@@ -201,7 +205,7 @@ ACE_Name_Request::name (void) const
 }
 
 void
-ACE_Name_Request::name (const ACE_USHORT16 *t)
+ACE_Name_Request::name (const ACE_WCHAR_T *t)
 {
   ACE_TRACE ("ACE_Name_Request::name");
   (void) ACE_OS::memcpy (this->name_,
@@ -211,7 +215,7 @@ ACE_Name_Request::name (const ACE_USHORT16 *t)
 
 // = Set/get the value
 
-const ACE_USHORT16 *
+const ACE_WCHAR_T *
 ACE_Name_Request::value (void) const
 {
   ACE_TRACE ("ACE_Name_Request::value");
@@ -219,7 +223,7 @@ ACE_Name_Request::value (void) const
 }
 
 void
-ACE_Name_Request::value (const ACE_USHORT16 *c)
+ACE_Name_Request::value (const ACE_WCHAR_T *c)
 {
   ACE_TRACE ("ACE_Name_Request::value");
 
@@ -259,7 +263,7 @@ ACE_Name_Request::encode (void *&buf)
 
   size_t nv_data_len =
     (this->transfer_.name_len_ + this->transfer_.value_len_)
-    / sizeof (ACE_USHORT16);
+    / sizeof (ACE_WCHAR_T);
 
   for (size_t i = 0; i < nv_data_len; i++)
     this->transfer_.data_[i] =
@@ -297,15 +301,15 @@ ACE_Name_Request::decode (void)
 
   size_t nv_data_len =
     (this->transfer_.name_len_ + this->transfer_.value_len_)
-    / sizeof (ACE_USHORT16);
+    / sizeof (ACE_WCHAR_T);
 
   for (size_t i = 0; i < nv_data_len; i++)
     this->transfer_.data_[i] =
       ntohs (this->transfer_.data_[i]);
 
   this->name_ = this->transfer_.data_;
-  this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (ACE_USHORT16)];
-  this->type_ = (char *)(&this->value_[this->transfer_.value_len_ / sizeof (ACE_USHORT16)]);
+  this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (ACE_WCHAR_T)];
+  this->type_ = (char *)(&this->value_[this->transfer_.value_len_ / sizeof (ACE_WCHAR_T)]);
   this->type_[this->transfer_.type_len_] = '\0';
 
   // Decode the variable-sized portion.
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index a3f3da607b5..9e6ec99b993 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -9,7 +9,6 @@
  *   Define the format used to exchange messages between the
  *   ACE_Name Server and its clients.
  *
- *
  *  @author Gerhard Lenzer
  *  @author Douglas C. Schmidt
  *  @author and Prashant Jain
@@ -19,15 +18,16 @@
 
 #ifndef ACE_NAME_REQUEST_REPLY_H
 #define ACE_NAME_REQUEST_REPLY_H
+
 #include "ace/pre.h"
 
-#include "ace/Time_Value.h"
+#include "ace/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
+class ACE_Time_Value;
 
 /**
  * @class ACE_Name_Request
@@ -71,9 +71,9 @@ public:
 
   /// Create a <ACE_Name_Request> message.
   ACE_Name_Request (ACE_INT32 msg_type, // Type of request.
-                    const ACE_USHORT16 name[], //
+                    const ACE_WCHAR_T name[], //
                     const ACE_UINT32 name_length,
-                    const ACE_USHORT16 value[],
+                    const ACE_WCHAR_T value[],
                     const ACE_UINT32 value_length,
                     const char type[],
                     const ACE_UINT32 type_length,
@@ -100,12 +100,12 @@ public:
   void timeout (const ACE_Time_Value timeout);
 
   // = Set/get the name
-  const ACE_USHORT16 *name (void) const;
-  void name (const ACE_USHORT16 *);
+  const ACE_WCHAR_T *name (void) const;
+  void name (const ACE_WCHAR_T *);
 
   // = Set/get the value
-  const ACE_USHORT16 *value (void) const;
-  void value (const ACE_USHORT16 *);
+  const ACE_WCHAR_T *value (void) const;
+  void value (const ACE_WCHAR_T *);
 
   // = Set/get the type
   const char *type (void) const;
@@ -167,17 +167,17 @@ private:
     /// The data portion contains the <name_>
     /// followed by the <value_>
     /// followed by the <type_>.
-    ACE_USHORT16 data_[MAX_NAME_LENGTH + MAXPATHLEN + MAXPATHLEN + 2];
+    ACE_WCHAR_T data_[MAX_NAME_LENGTH + MAXPATHLEN + MAXPATHLEN + 2];
   };
 
   /// Transfer buffer.
   Transfer transfer_;
 
   /// Pointer to the beginning of the name in this->data_.
-  ACE_USHORT16 *name_;
+  ACE_WCHAR_T *name_;
 
   /// Pointer to the beginning of the value in this->data_;
-  ACE_USHORT16 *value_;
+  ACE_WCHAR_T *value_;
 
   /// Pointer to the beginning of the type in this->data_;
   char *type_;
@@ -257,4 +257,5 @@ private:
 };
 
 #include "ace/post.h"
+
 #endif /* ACE_NAME_REQUEST_REPLY_H */
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index 2973d2099e4..66c05cbab1e 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -1,11 +1,10 @@
-// Remote_Name_Space.cpp
-// $Id$
-
 #include "ace/Remote_Name_Space.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(ace, Remote_Name_Space, "$Id$")
+ACE_RCSID (ace,
+           Remote_Name_Space,
+           "$Id$")
 
 int
 ACE_Remote_Name_Space::open (const ACE_TCHAR *servername, u_short port)
@@ -43,12 +42,12 @@ ACE_Remote_Name_Space::bind (const ACE_NS_WString &name,
                              const char *type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::bind");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> name_urep (name.ushort_rep ());
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> value_urep (value.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
   ACE_UINT32 name_len =
-    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_WCHAR_T));
   ACE_UINT32 value_len =
-    ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_WCHAR_T));
   ACE_UINT32 type_len =
     ACE_static_cast (ACE_UINT32, ACE_OS_String::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::BIND,
@@ -67,12 +66,12 @@ ACE_Remote_Name_Space::rebind (const ACE_NS_WString &name,
                                const char *type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::rebind");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> name_urep (name.ushort_rep ());
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> value_urep (value.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
   ACE_UINT32 name_len =
-    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_WCHAR_T));
   ACE_UINT32 value_len =
-    ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, value.length () * sizeof (ACE_WCHAR_T));
   ACE_UINT32 type_len =
     ACE_static_cast (ACE_UINT32, ACE_OS_String::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::REBIND,
@@ -91,9 +90,9 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name,
                                 char *&type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::resolve");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> name_urep (name.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
   ACE_UINT32 name_len =
-    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::RESOLVE,
                             name_urep.get (),
                             name_len,
@@ -107,7 +106,7 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name,
   if (this->ns_proxy_.recv_reply (reply) == -1)
     return -1;
 
-  ACE_NS_WString temp (reply.value (), reply.value_len () / sizeof (ACE_USHORT16));
+  ACE_NS_WString temp (reply.value (), reply.value_len () / sizeof (ACE_WCHAR_T));
   value = temp;
   ACE_NEW_RETURN (type,
                   char[reply.type_len () + 1],
@@ -120,9 +119,9 @@ int
 ACE_Remote_Name_Space::unbind (const ACE_NS_WString &name)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::unbind");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> name_urep (name.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
   ACE_UINT32 name_len =
-    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, name.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::UNBIND,
                             name_urep.get (),
                             name_len,
@@ -135,9 +134,9 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
                                    const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_names");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAMES,
                             pattern_urep.get (),
                             pattern_len,
@@ -157,7 +156,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString name (reply.name (),
-                               reply.name_len () / sizeof (ACE_USHORT16));
+                               reply.name_len () / sizeof (ACE_WCHAR_T));
           set.insert (name);
         }
     }
@@ -169,9 +168,9 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
                                     const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_values");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUES,
                             pattern_urep.get (),
                             pattern_len,
@@ -191,7 +190,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString value (reply.value (),
-                                reply.value_len () / sizeof (ACE_USHORT16));
+                                reply.value_len () / sizeof (ACE_WCHAR_T));
           set.insert (value);
         }
     }
@@ -204,9 +203,9 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
                                    const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_types");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPES,
                             pattern_urep.get (),
                             pattern_len,
@@ -239,9 +238,9 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
                                           const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_name_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -262,9 +261,9 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString name (reply.name (),
-                               reply.name_len () / sizeof (ACE_USHORT16));
+                               reply.name_len () / sizeof (ACE_WCHAR_T));
           ACE_NS_WString value (reply.value (),
-                                reply.value_len () / sizeof (ACE_USHORT16));
+                                reply.value_len () / sizeof (ACE_WCHAR_T));
           ACE_Name_Binding entry (name,
                                   value,
                                   reply.type ());
@@ -280,9 +279,9 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
                                            const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_value_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -303,9 +302,9 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString name (reply.name (),
-                               reply.name_len () / sizeof (ACE_USHORT16));
+                               reply.name_len () / sizeof (ACE_WCHAR_T));
           ACE_NS_WString value (reply.value (),
-                                reply.value_len () / sizeof (ACE_USHORT16));
+                                reply.value_len () / sizeof (ACE_WCHAR_T));
           ACE_Name_Binding entry (name,
                                   value,
                                   reply.type());
@@ -321,9 +320,9 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
                                           const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_type_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_USHORT16));
+    ACE_static_cast (ACE_UINT32, pattern.length () * sizeof (ACE_WCHAR_T));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -344,9 +343,9 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString name (reply.name (),
-                               reply.name_len () / sizeof (ACE_USHORT16));
+                               reply.name_len () / sizeof (ACE_WCHAR_T));
           ACE_NS_WString value (reply.value (),
-                                reply.value_len () / sizeof (ACE_USHORT16));
+                                reply.value_len () / sizeof (ACE_WCHAR_T));
           ACE_Name_Binding entry (name,
                                   value,
                                   reply.type ());
@@ -373,7 +372,7 @@ ACE_Remote_Name_Space::dump (void) const
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Array_Ptr<ACE_USHORT16>;
+template class ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_USHORT16>
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index 3c107d2229b..7b91a54907b 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #define ACE_BUILD_SVC_DLL
 
 #include "ace/Containers.h"
@@ -8,7 +6,9 @@
 #include "ace/Auto_Ptr.h"
 #include "Name_Handler.h"
 
-ACE_RCSID(lib, Name_Handler, "$Id$")
+ACE_RCSID(lib,
+          Name_Handler,
+          "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX>;
@@ -378,9 +378,9 @@ ACE_Name_Handler::shared_bind (int rebind)
 {
   ACE_TRACE ("ACE_Name_Handler::shared_bind");
   ACE_NS_WString a_name (this->name_request_.name (),
-                         this->name_request_.name_len () / sizeof (ACE_USHORT16));
+                         this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
   ACE_NS_WString a_value (this->name_request_.value (),
-                          this->name_request_.value_len () / sizeof (ACE_USHORT16));
+                          this->name_request_.value_len () / sizeof (ACE_WCHAR_T));
   int result;
   if (rebind == 0)
     {
@@ -418,7 +418,7 @@ ACE_Name_Handler::resolve (void)
   ACE_DEBUG ((LM_DEBUG, "request for RESOLVE \n"));
 #endif /* 0 */
   ACE_NS_WString a_name (this->name_request_.name (),
-                         this->name_request_.name_len () / sizeof (ACE_USHORT16));
+                         this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
 
   // The following will deliver our reply back to client we
   // pre-suppose success (indicated by type RESOLVE).
@@ -427,12 +427,12 @@ ACE_Name_Handler::resolve (void)
   char *atype;
   if (NAMING_CONTEXT::instance ()->resolve (a_name, avalue, atype) == 0)
     {
-      ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> avalue_urep (avalue.ushort_rep ());
+      ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> avalue_urep (avalue.rep ());
       ACE_Name_Request nrq (ACE_Name_Request::RESOLVE,
                             0,
                             0,
                             avalue_urep.get (),
-                            avalue.length () * sizeof (ACE_USHORT16),
+                            avalue.length () * sizeof (ACE_WCHAR_T),
                             atype, ACE_OS::strlen (atype));
       delete[] atype;
       return this->send_request (nrq);
@@ -451,7 +451,7 @@ ACE_Name_Handler::unbind (void)
   ACE_DEBUG ((LM_DEBUG, "request for UNBIND \n"));
 #endif /* 0 */
   ACE_NS_WString a_name (this->name_request_.name (),
-                         this->name_request_.name_len () / sizeof (ACE_USHORT16));
+                         this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
 
   if (NAMING_CONTEXT::instance ()->unbind (a_name) == 0)
     return this->send_reply (0);
@@ -463,10 +463,10 @@ ACE_Name_Request
 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 ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_name_urep (one_name->rep ());
   return ACE_Name_Request (ACE_Name_Request::LIST_NAMES,
                            one_name_urep.get (),
-                           one_name->length () * sizeof (ACE_USHORT16),
+                           one_name->length () * sizeof (ACE_WCHAR_T),
                            0, 0,
                            0, 0);
 }
@@ -475,11 +475,11 @@ ACE_Name_Request
 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 ());
+  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_value_urep (one_value->rep ());
   return ACE_Name_Request (ACE_Name_Request::LIST_VALUES,
                            0, 0,
                            one_value_urep.get (),
-                           one_value->length () * sizeof (ACE_USHORT16),
+                           one_value->length () * sizeof (ACE_WCHAR_T),
                            0, 0);
 }
 
@@ -501,7 +501,7 @@ ACE_Name_Handler::lists (void)
 
   ACE_PWSTRING_SET set;
   ACE_NS_WString pattern (this->name_request_.name (),
-                          this->name_request_.name_len () / sizeof (ACE_USHORT16));
+                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
 
   // Get the index into the list table
   int index = ACE_LIST_MAP (this->name_request_.msg_type (),
@@ -551,7 +551,7 @@ ACE_Name_Handler::lists_entries (void)
   ACE_TRACE ("ACE_Name_Handler::lists_entries");
   ACE_BINDING_SET set;
   ACE_NS_WString pattern (this->name_request_.name (),
-                          this->name_request_.name_len () / sizeof (ACE_USHORT16));
+                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
 
   int result = -1;
 
@@ -601,15 +601,15 @@ ACE_Name_Handler::lists_entries (void)
            set_iterator.next (one_entry) !=0;
            set_iterator.advance())
         {
-           ACE_Auto_Basic_Array_Ptr<ACE_USHORT16>
-             name_urep (one_entry->name_.ushort_rep ());
-           ACE_Auto_Basic_Array_Ptr<ACE_USHORT16>
-             value_urep (one_entry->value_.ushort_rep ());
+           ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T>
+             name_urep (one_entry->name_.rep ());
+           ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T>
+             value_urep (one_entry->value_.rep ());
            ACE_Name_Request mynrq (this->name_request_.msg_type (),
                                   name_urep.get (),
-                                  one_entry->name_.length () * sizeof (ACE_USHORT16),
+                                  one_entry->name_.length () * sizeof (ACE_WCHAR_T),
                                   value_urep.get (),
-                                  one_entry->value_.length () * sizeof (ACE_USHORT16),
+                                  one_entry->value_.length () * sizeof (ACE_WCHAR_T),
                                   one_entry->type_,
                                   ACE_OS::strlen (one_entry->type_));