Mon Nov 15 09:40:48 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * Makefile.am:
          Zap TAO as directory

        * ACEXML/common/XML_Types.h:
        * ace/Auto_Ptr.h:
        * ace/Basic_Types.h:
        * ace/OS_NS_Thread.cpp:
        * ace/Obchunk.cpp:
        * ace/Object_Manager.cpp:
        * ace/Object_Manager_Base.cpp:
        * ace/Proactor.h:
        * ace/SOCK_Dgram.h:
        * ace/SOCK_Dgram.inl:
        * ace/SOCK_Dgram_Mcast.h:
        * ace/SOCK_Dgram_Mcast.cpp:
        * ace/SString.h:
        * ace/SString.cpp:
        * ace/Thread_Exit.cpp:
        * ace/Timer_List.h:
        * ace/config-lite.h:
        * apps/JAWS/clients/Caching/Locator_Request_Reply.cpp:
        * apps/JAWS/clients/Caching/URL_Properties.h:
        * apps/JAWS/clients/Caching/URL_Properties.inl:
        * apps/JAWS/clients/Caching/URL_Properties.cpp:
          Clean of deprecated define ACE_USHORT16 and ACE_AUTO_PTR_RESET

        * configure.ac:
          Updated support address

4 files changed, 23 insertions, 23 deletions

diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
index 645ad3d65c1..60e395d5b76 100644
--- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
+++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.cpp
@@ -183,9 +183,9 @@ ACE_URL_Locator_Request::decode (void *buffer)
       total_length += this->offer_->decode (cbuffer + total_length);
     }
 
-  this->id_ = ACE_WString ((ACE_USHORT16 *) (cbuffer + total_length));
+  this->id_ = ACE_WString ((ACE_UINT16 *) (cbuffer + total_length));
   total_length += ACE_WString_Helper::decode (cbuffer + total_length);
-  this->url_ = ACE_WString ((ACE_USHORT16 *) (cbuffer + total_length));
+  this->url_ = ACE_WString ((ACE_UINT16 *) (cbuffer + total_length));
   total_length += ACE_WString_Helper::decode (cbuffer + total_length);
 
   ACE_ASSERT (total_length == buf_size);
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp b/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp
index 2468198b68a..b356656d2d2 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp
+++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.cpp
@@ -15,25 +15,25 @@
 size_t
 ACE_WString_Helper::encode (void *buf, const ACE_WString &wstr)
 {
-  ACE_USHORT16 *wptr = (ACE_USHORT16 *) buf;
+  ACE_UINT16 *wptr = (ACE_UINT16 *) buf;
   size_t i;
 
   for (i= 0; i <= wstr.length (); i++)
     wptr[i] = htons (wstr[i]);
 
-  return i * sizeof (ACE_USHORT16);
+  return i * sizeof (ACE_UINT16);
 }
 
 size_t
 ACE_WString_Helper::decode (void *buf)
 {
-  ACE_USHORT16 *wptr = (ACE_USHORT16 *) buf;
+  ACE_UINT16 *wptr = (ACE_UINT16 *) buf;
   size_t i;
 
   for (i = 0; wptr[i] != 0; i++)
     wptr[i] = ntohs (wptr[i]);
 
-  return (i + 1) * sizeof (ACE_USHORT16);
+  return (i + 1) * sizeof (ACE_UINT16);
 }
 
 size_t
@@ -50,11 +50,11 @@ ACE_URL_Property::decode (void *buf)
 {
   char *cbuf = (char *) buf;
   size_t len = ACE_WString_Helper::decode(buf);
-  this->name ((ACE_USHORT16 *) cbuf);
+  this->name ((ACE_UINT16 *) cbuf);
 
   cbuf += len;
   len += ACE_WString_Helper::decode ((void *) cbuf);
-  this->value ((ACE_USHORT16 *) cbuf);
+  this->value ((ACE_UINT16 *) cbuf);
   return len;
 }
 
@@ -81,7 +81,7 @@ ACE_URL_Property::dump (void) const
 size_t
 ACE_URL_Offer::size (void) const
 {
-  size_t sum = (this->url_.length () + 1) * sizeof (ACE_USHORT16);
+  size_t sum = (this->url_.length () + 1) * sizeof (ACE_UINT16);
   sum += ::ace_array_size (this->prop_);
   return sum;
 }
@@ -107,7 +107,7 @@ ACE_URL_Offer::decode (void *buf)
   size_t len = sizeof (ACE_UINT32);
   size_t a_size = (size_t) ntohl (*(ACE_UINT32 *) buf);
   len += ACE_WString_Helper::decode ((void *) ((char *) buf + len));
-  this->url ((ACE_USHORT16 *) ((char *) buf + len));
+  this->url ((ACE_UINT16 *) ((char *) buf + len));
 
   ACE_URL_Property_Seq prop_seq (a_size);
   this->url_properties (prop_seq);
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.h b/ACE/apps/JAWS/clients/Caching/URL_Properties.h
index a4f63f36b97..d4094ec2ebd 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Properties.h
+++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.h
@@ -45,7 +45,7 @@ public:
 
   static size_t decode (void *buf);
   // This function doesn't relate to ACE_WString directly.
-  // It converts an ACE_USHORT16 string from network
+  // It converts an ACE_UINT16 string from network
   // byte order to host byte order.  Returns size of the string.
 };
 
@@ -64,8 +64,8 @@ public:
                     const char *value=0);
   // Create a new property.
 
-  ACE_URL_Property (const ACE_USHORT16 *name,
-                    const ACE_USHORT16 *value);
+  ACE_URL_Property (const ACE_UINT16 *name,
+                    const ACE_UINT16 *value);
   // Create a new property using wchar strings.  This is mostly used
   // to support DBCS or UNICODE.
 
@@ -89,7 +89,7 @@ public:
   const ACE_WString &name (void) const;
 
   // = Set property name.
-  void name (const ACE_USHORT16 *n);
+  void name (const ACE_UINT16 *n);
   void name (const char *n);
 
   // = Query property value.
@@ -97,7 +97,7 @@ public:
   const ACE_WString &value (void) const;
 
   // = Set property value.
-  void value (const ACE_USHORT16 *v);
+  void value (const ACE_UINT16 *v);
   void value (const char *v);
 
   // = Helper functions for encoding and decoding.
@@ -160,7 +160,7 @@ public:
 
   // = Set URL.
   void url (const char *url);
-  void url (const ACE_USHORT16 *url);
+  void url (const ACE_UINT16 *url);
 
   ACE_URL_Property_Seq &url_properties (void);
   // Get properties of this offer.
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
index c32484dbb5c..c8fdd65ac25 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
+++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
@@ -5,7 +5,7 @@
 ACE_INLINE size_t
 ACE_WString_Helper::size (const ACE_WString &wstr)
 {
-  return (wstr.length () + 1) * sizeof (ACE_USHORT16);
+  return (wstr.length () + 1) * sizeof (ACE_UINT16);
 }
 
 ACE_INLINE
@@ -16,8 +16,8 @@ ACE_URL_Property::ACE_URL_Property (const char *name, const char *value)
 }
 
 ACE_INLINE
-ACE_URL_Property::ACE_URL_Property (const ACE_USHORT16 *name,
-                                    const ACE_USHORT16 *value)
+ACE_URL_Property::ACE_URL_Property (const ACE_UINT16 *name,
+                                    const ACE_UINT16 *value)
   : name_ (name),
     value_ (value)
 {
@@ -81,7 +81,7 @@ ACE_URL_Property::name (const char *n)
 }
 
 ACE_INLINE void
-ACE_URL_Property::name (const ACE_USHORT16 *n)
+ACE_URL_Property::name (const ACE_UINT16 *n)
 {
   this->name_ = ACE_WString (n);
 }
@@ -105,7 +105,7 @@ ACE_URL_Property::value (const char *v)
 }
 
 ACE_INLINE void
-ACE_URL_Property::value (const ACE_USHORT16 *v)
+ACE_URL_Property::value (const ACE_UINT16 *v)
 {
   this->value_ = ACE_WString (v);
 }
@@ -116,7 +116,7 @@ ACE_URL_Property::size (void) const
 {
   size_t len = 2;
     len += this->name_.length () + this->value_.length ();
-  return len * sizeof (ACE_USHORT16);
+  return len * sizeof (ACE_UINT16);
 }
 
 ACE_INLINE
@@ -179,7 +179,7 @@ ACE_URL_Offer::url (void) const
 }
 
 ACE_INLINE void
-ACE_URL_Offer::url (const ACE_USHORT16 *url)
+ACE_URL_Offer::url (const ACE_UINT16 *url)
 {
   this->url_ = ACE_WString (url);
 }