From 2e21fa6b925c4572d620248f1b149a5d652836b2 Mon Sep 17 00:00:00 2001
From: Nay <dnpd.dd@gmail.com>
Date: Mon, 17 Sep 2012 23:21:01 +0100
Subject: Core/Dependencies: Update ACE to v6.1.4 (Windows only)

Tested in multiple configurations
.diff with TC changes added
---
 dep/acelite/ace/SString.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'dep/acelite/ace/SString.cpp')

diff --git a/dep/acelite/ace/SString.cpp b/dep/acelite/ace/SString.cpp
index 5a087e3e0a9..db66850fda4 100644
--- a/dep/acelite/ace/SString.cpp
+++ b/dep/acelite/ace/SString.cpp
@@ -1,4 +1,4 @@
-// $Id: SString.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
+// $Id: SString.cpp 92580 2010-11-15 09:48:02Z johnnyw $
 
 #include "ace/Malloc_T.h"
 #include "ace/OS_Memory.h"
@@ -79,7 +79,7 @@ ACE_NS_WString::char_rep (void) const
     }
 }
 
-ACE_USHORT16 *
+ACE_UINT16 *
 ACE_NS_WString::ushort_rep (void) const
 {
   ACE_TRACE ("ACE_NS_WString::ushort_rep");
@@ -87,16 +87,16 @@ ACE_NS_WString::ushort_rep (void) const
     return 0;
   else
     {
-      ACE_USHORT16 *t = 0;
+      ACE_UINT16 *t = 0;
 
       ACE_NEW_RETURN (t,
-                      ACE_USHORT16[this->len_ + 1],
+                      ACE_UINT16[this->len_ + 1],
                       0);
 
       for (size_type i = 0; i < this->len_; ++i)
         // Note that this cast may lose data if wide chars are
         // actually used!
-        t[i] = (ACE_USHORT16)this->rep_[i];
+        t[i] = (ACE_UINT16)this->rep_[i];
 
       t[this->len_] = 0;
       return t;
@@ -125,7 +125,7 @@ ACE_NS_WString::ACE_NS_WString (const char *s,
 }
 
 #if defined (ACE_WSTRING_HAS_USHORT_SUPPORT)
-ACE_NS_WString::ACE_NS_WString (const ACE_USHORT16 *s,
+ACE_NS_WString::ACE_NS_WString (const ACE_UINT16 *s,
                                 size_type len,
                                 ACE_Allocator *alloc)
   : ACE_WString (alloc)
-- 
cgit v1.2.3