diff options
Diffstat (limited to 'ACEXML')
| -rw-r--r-- | ACEXML/ChangeLog | 13 | ||||
| -rw-r--r-- | ACEXML/common/NamespaceSupport.cpp | 2 | ||||
| -rw-r--r-- | ACEXML/common/XML_Types.h | 6 | ||||
| -rw-r--r-- | ACEXML/parser/parser/Parser.cpp | 8 |
4 files changed, 4 insertions, 25 deletions
diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog index d1685d6b5a1..51e110a9178 100644 --- a/ACEXML/ChangeLog +++ b/ACEXML/ChangeLog @@ -1,12 +1,3 @@ -Tue Aug 17 19:07:11 2004 J.T. Conklin <jtc@acorntoolworks.com> - - * common/NamespaceSupport.cpp: - - Changed ACE_NEW_RETURN to use "NS_Node_T" instead of "struct - NS_Node_T" --- the latter triggers a gcc 3.3 parser bug when - used with the "new (std::nothrow)" version of ACE_NEW_RETURN. - Fortunately, the "struct" is unnecessary. - Sat Feb 21 23:51:25 2004 . <.@isis.vanderbilt.edu> * common/Exception.h: @@ -783,7 +774,3 @@ Wed Oct 23 17:27:14 2002 Krishnakumar B <kitty@cs.wustl.edu> simpler. Removed try_grow_cdata() as it is no longer needed. Handle the case when the parser was accepting invalid character references(). - -Local Variables: -add-log-time-format: current-time-string -End: 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 */ diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp index d60a9b35c31..7eb09e744e4 100644 --- a/ACEXML/parser/parser/Parser.cpp +++ b/ACEXML/parser/parser/Parser.cpp @@ -2225,15 +2225,9 @@ ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t& len) if (!this->isChar (sum)) return -1; int clen; -#if defined (ACE_USES_WCHAR) -# if (ACE_SIZEOF_WCHAR == 2) // UTF-16 +#if defined (ACE_USES_WCHAR) // UTF-16 if ((clen = ACEXML_Transcoder::ucs42utf16 (sum, buf, len)) < 0) return -1; -# elif (ACE_SIZEOF_WCHAR == 4) // UCS 4 - buf [0] = sum; - buf [1] = 0; - clen = 2; -# endif /* ACE_SIZEOF_WCHAR */ #else // or UTF-8 if ((clen = ACEXML_Transcoder::ucs42utf8 (sum, buf, len)) < 0) |