summaryrefslogtreecommitdiff
path: root/ACE/ACEXML
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-11-15 09:48:02 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-11-15 09:48:02 +0000
commit3c03a34dde72d7f18224c52ece3941dbc22f5a39 (patch)
tree584688814b985325b922793640ef09b54f4c6613 /ACE/ACEXML
parentf4c102818377b27276bb83af618ceca603f604f9 (diff)
downloadATCD-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/ACEXML')
-rw-r--r--ACE/ACEXML/common/XML_Types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ACEXML/common/XML_Types.h b/ACE/ACEXML/common/XML_Types.h
index 5a55d6b7754..a4dec7e1639 100644
--- a/ACE/ACEXML/common/XML_Types.h
+++ b/ACE/ACEXML/common/XML_Types.h
@@ -30,7 +30,7 @@
# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 2)
typedef wchar_t ACEXML_UTF16;
# else
-typedef ACE_USHORT16 ACEXML_UTF16;
+typedef ACE_UINT16 ACEXML_UTF16;
# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 2 */
# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 4)