diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/SString.h | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/SString.h')
| -rw-r--r-- | dep/acelite/ace/SString.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/acelite/ace/SString.h b/dep/acelite/ace/SString.h index e7ff8ea7872..3c5f9957be7 100644 --- a/dep/acelite/ace/SString.h +++ b/dep/acelite/ace/SString.h @@ -4,7 +4,7 @@ /** * @file SString.h * - * $Id: SString.h 91058 2010-07-12 08:20:09Z johnnyw $ + * $Id: SString.h 92580 2010-11-15 09:48:02Z johnnyw $ * * @author Douglas C. Schmidt (schmidt@cs.wustl.edu) */ @@ -75,7 +75,7 @@ public: #if defined (ACE_WSTRING_HAS_USHORT_SUPPORT) /// Constructor that takes in a ushort16 string (mainly used by the /// ACE Name_Space classes) - ACE_NS_WString (const ACE_USHORT16 *s, + ACE_NS_WString (const ACE_UINT16 *s, size_type len, ACE_Allocator *alloc = 0); #endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */ @@ -102,7 +102,7 @@ public: /// Transform into a copy of a USHORT16 representation (caller must /// delete). Note, behavior is undefined when sizeof (wchar_t) != 2. - ACE_USHORT16 *ushort_rep (void) const; + ACE_UINT16 *ushort_rep (void) const; }; ACE_Export |