diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-15 09:48:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-15 09:48:02 +0000 |
| commit | 3c03a34dde72d7f18224c52ece3941dbc22f5a39 (patch) | |
| tree | 584688814b985325b922793640ef09b54f4c6613 /ACE/ace/SString.h | |
| parent | f4c102818377b27276bb83af618ceca603f604f9 (diff) | |
| download | ATCD-3c03a34dde72d7f18224c52ece3941dbc22f5a39.tar.gz | |
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
Diffstat (limited to 'ACE/ace/SString.h')
| -rw-r--r-- | ACE/ace/SString.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/SString.h b/ACE/ace/SString.h index 900c8143a88..273882e9093 100644 --- a/ACE/ace/SString.h +++ b/ACE/ace/SString.h @@ -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 |