diff options
Diffstat (limited to 'ACEXML/common')
| -rw-r--r-- | ACEXML/common/NamespaceSupport.cpp | 2 | ||||
| -rw-r--r-- | ACEXML/common/XML_Types.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp index 5e049ca9cd4..d89a02d8c51 100644 --- a/ACEXML/common/NamespaceSupport.cpp +++ b/ACEXML/common/NamespaceSupport.cpp @@ -32,7 +32,7 @@ int ACEXML_Namespace_Context_Stack::push (ACEXML_NS_CONTEXT *nsc) { struct NS_Node_T *temp = 0; - ACE_NEW_RETURN (temp, NS_Node_T, -1); + ACE_NEW_RETURN (temp, struct NS_Node_T, -1); temp->item_ = nsc; temp->next_ = this->head_; diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h index 5a55d6b7754..1693253b0db 100644 --- a/ACEXML/common/XML_Types.h +++ b/ACEXML/common/XML_Types.h @@ -23,7 +23,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Basic_Types.h" #include "ace/SString.h" #include "ace/Functor_String.h" @@ -54,12 +53,11 @@ typedef char ACEXML_UTF8; * using the built-in conversion functions as they only perform simple * copy without any encoding conversion. */ -typedef ACE_TCHAR ACEXML_Char; # if defined (ACE_USES_WCHAR) -//typedef ACEXML_UTF16 ACEXML_Char; +typedef ACEXML_UTF16 ACEXML_Char; typedef ACE_WString ACEXML_String; # else -//typedef ACEXML_UTF8 ACEXML_Char; +typedef ACEXML_UTF8 ACEXML_Char; typedef ACE_CString ACEXML_String; # endif /* ACE_USES_WCHAR */ |