From xalandfranklin@example.org Tue Jul 01 00:42:43 2008 Return-Path: <xalandfranklin@example.org> Delivered-To: dfranklin@example.org Received: (qmail 80041 invoked from network); 1 Jul 2008 00:42:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jul 2008 00:42:43 -0000 Received: (qmail 43610 invoked by uid 500); 1 Jul 2008 00:42:44 -0000 Delivered-To: dfranklin@example.org Received: (qmail 43595 invoked by uid 500); 1 Jul 2008 00:42:44 -0000 Mailing-List: contact dfranklin@example.org; run by ezmlm Precedence: bulk list-help: <mailto:dfranklin@example.org> list-unsubscribe: <mailto:dfranklin@example.org> List-Post: <mailto:dfranklin@example.org> Reply-To: <dfranklin@example.org> List-Id: <xalan-cvs.xml.apache.org> Delivered-To: mailing list dfranklin@example.org Received: (qmail 43585 invoked by uid 99); 1 Jul 2008 00:42:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jun 2008 17:42:44 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jul 2008 00:42:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E29123889BB; Mon, 30 Jun 2008 17:41:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r672963 - in /xalan/c/trunk/src/xalanc/PlatformSupport: StdBinInputStream.cpp StdBinInputStream.hpp Date: Tue, 01 Jul 2008 00:41:52 -0000 To: dfranklin@example.org From: dfranklin@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <dfranklin@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dbertoni Date: Mon Jun 30 17:41:52 2008 New Revision: 672963 URL: http://svn.apache.org/viewvc?rev=672963&view=rev Log: Fixed return type on new member function. Modified: xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp Modified: xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp?rev=672963&r1=672962&r2=672963&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp Mon Jun 30 17:41:52 2008 @@ -82,7 +82,7 @@ -const XMLCh* +const XalanDOMChar* StdBinInputStream888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getContentType() const { return 0; Modified: xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp?rev=672963&r1=672962&r2=672963&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp Mon Jun 30 17:41:52 2008 @@ -68,7 +68,7 @@ XMLByte* const toFill, const XalanSize_t maxToRead); - virtual const XMLCh* + virtual const XalanDOMChar* getContentType() const; private: --------------------------------------------------------------------- To unsubscribe, e-mail: dfranklin@example.org For additional commands, e-mail: dfranklin@example.org From xalandfranklin@example.org Fri Jul 04 00:29:06 2008 Return-Path: <xalandfranklin@example.org> Delivered-To: dfranklin@example.org Received: (qmail 83978 invoked from network); 4 Jul 2008 00:29:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Jul 2008 00:29:06 -0000 Received: (qmail 26766 invoked by uid 500); 4 Jul 2008 00:29:07 -0000 Delivered-To: dfranklin@example.org Received: (qmail 26750 invoked by uid 500); 4 Jul 2008 00:29:07 -0000 Mailing-List: contact dfranklin@example.org; run by ezmlm Precedence: bulk list-help: <mailto:dfranklin@example.org> list-unsubscribe: <mailto:dfranklin@example.org> List-Post: <mailto:dfranklin@example.org> Reply-To: <dfranklin@example.org> List-Id: <xalan-cvs.xml.apache.org> Delivered-To: mailing list dfranklin@example.org Received: (qmail 26741 invoked by uid 99); 4 Jul 2008 00:29:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2008 17:29:07 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jul 2008 00:28:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0B46238899B; Thu, 3 Jul 2008 17:28:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r673887 - in /xalan/c/trunk/src/xalanc: PlatformSupport/ XMLSupport/ XPath/ XSLT/ XalanSourceTree/ XercesParserLiaison/ Date: Fri, 04 Jul 2008 00:28:14 -0000 To: dfranklin@example.org From: dfranklin@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <dfranklin@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dbertoni Date: Thu Jul 3 17:28:13 2008 New Revision: 673887 URL: http://svn.apache.org/viewvc?rev=673887&view=rev Log: More updates for Xerces-C API changes. Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp xalan/c/trunk/src/xalanc/XMLSupport/FormatterToDOM.cpp xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp Thu Jul 3 17:28:13 2008 @@ -1637,7 +1637,7 @@ template <class ScalarType> -void +XalanDOMString& ScalarToDecimalString( ScalarType theValue, XalanDOMString& theResult) @@ -1654,6 +1654,8 @@ theResult, theBegin, XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type(theEnd - theBegin)); + + return theResult; } @@ -1700,7 +1702,7 @@ template <class ScalarType> -void +XalanDOMString& UnsignedScalarToHexadecimalString( ScalarType theValue, XalanDOMString& theResult) @@ -1720,6 +1722,8 @@ theBegin, XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type(theEnd - theBegin)); } + + return theResult; } @@ -1744,9 +1748,7 @@ long theValue, XalanDOMString& theResult) { - UnsignedScalarToHexadecimalString(theValue, theResult); - - return theResult; + return UnsignedScalarToHexadecimalString(theValue, theResult); } @@ -1756,9 +1758,7 @@ unsigned long theValue, XalanDOMString& theResult) { - UnsignedScalarToHexadecimalString(theValue, theResult); - - return theResult; + return UnsignedScalarToHexadecimalString(theValue, theResult); } @@ -1768,32 +1768,26 @@ long theValue, XalanDOMString& theResult) { - ScalarToDecimalString(theValue, theResult); - - return theResult; + return ScalarToDecimalString(theValue, theResult); } XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) -NumberToDOMString( - unsigned long long theValue, - XalanDOMString& theResult) +UnsignedLongToDOMString( + unsigned long theValue, + XalanDOMString& theResult) { - ScalarToDecimalString(theValue, theResult); - - return theResult; + return ScalarToDecimalString(theValue, theResult); } XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) -UnsignedLongToDOMString( - unsigned long theValue, - XalanDOMString& theResult) +NumberToDOMString( + unsigned long long theValue, + XalanDOMString& theResult) { - ScalarToDecimalString(theValue, theResult); - - return theResult; + return ScalarToDecimalString(theValue, theResult); } @@ -1803,9 +1797,7 @@ size_t theValue, XalanDOMString& theResult) { - ScalarToDecimalString(theValue, theResult); - - return theResult; + return ScalarToDecimalString(theValue, theResult); } Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToDOM.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToDOM.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToDOM.cpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToDOM.cpp Thu Jul 3 17:28:13 2008 @@ -314,11 +314,11 @@ XalanElement* theElement, AttributeListType& attrs) { - const unsigned int nAtts = attrs.getLength(); + const XalanSize_t nAtts = attrs.getLength(); if (m_prefixResolver == 0) { - for(unsigned int i = 0; i < nAtts; i++) + for (XalanSize_t i = 0; i < nAtts; i++) { assign(m_buffer1, attrs.getName(i)); assign(m_buffer2, attrs.getValue(i)); @@ -328,7 +328,7 @@ } else { - for(unsigned int i = 0; i < nAtts; i++) + for (XalanSize_t i = 0; i < nAtts; i++) { const XalanDOMChar* const theName = attrs.getName(i); assert(theName != 0); Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp Thu Jul 3 17:28:13 2008 @@ -344,9 +344,9 @@ accumName(name); - const unsigned int nAttrs = attrs.getLength(); + const XalanSize_t nAttrs = attrs.getLength(); - for (unsigned int i = 0; i < nAttrs ; i++) + for (XalanSize_t i = 0; i < nAttrs ; i++) { processAttribute(attrs.getName(i), attrs.getValue(i), elemProperties); } Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp Thu Jul 3 17:28:13 2008 @@ -1138,9 +1138,9 @@ accumName(XalanUnico888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4charLessThanSign); accumName(name); - const unsigned int nAttrs = attrs.getLength(); + const XalanSize_t nAttrs = attrs.getLength(); - for (unsigned int i = 0; i < nAttrs ; i++) + for (XalanSize_t i = 0; i < nAttrs ; i++) { processAttribute(attrs.getName(i), attrs.getValue(i)); } Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp Thu Jul 3 17:28:13 2008 @@ -183,9 +183,9 @@ writeName(name); - const unsigned int nAttrs = attrs.getLength(); + const XalanSize_t nAttrs = attrs.getLength(); - for (unsigned int i = 0; i < nAttrs ; i++) + for (XalanSize_t i = 0; i < nAttrs ; i++) { processAttribute(attrs.getName(i), attrs.getValue(i)); } Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp (original) +++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupport.hpp Thu Jul 3 17:28:13 2008 @@ -196,8 +196,8 @@ const XalanNode* sourceNode, const XalanDOMString& msg, const XalanDOMChar* uri, - int lineNo, - int charOffset) const = 0; + XalanFileLoc lineNo, + XalanFileLoc charOffset) const = 0; /** * Reset the instance. Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp (original) +++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.cpp Thu Jul 3 17:28:13 2008 @@ -15,9 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author <a href="mailto:dfranklin@example.org">David N. Bertoni</a> - */ #include "XPathEnvSupportDefault.hpp" @@ -452,8 +449,8 @@ const XalanNode* /* sourceNode */, const XalanDOMString& msg, const XalanDOMChar* uri, - int lineNo, - int charOffset) const + XalanFileLoc lineNo, + XalanFileLoc charOffset) const { cerr << msg; Modified: xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp (original) +++ xalan/c/trunk/src/xalanc/XPath/XPathEnvSupportDefault.hpp Thu Jul 3 17:28:13 2008 @@ -176,8 +176,8 @@ const XalanNode* sourceNode, const XalanDOMString& msg, const XalanDOMChar* uri, - int lineNo, - int charOffset) const; + XalanFileLoc lineNo, + XalanFileLoc charOffset) const; // These interfaces are inherited from Resettable... Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp (original) +++ xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp Thu Jul 3 17:28:13 2008 @@ -473,27 +473,27 @@ const AttributeListType& atts, StylesheetConstructionContext& constructionContext) { - const unsigned int nAttrs = atts.getLength(); + const XalanSize_t nAttrs = atts.getLength(); const LocatorType* const theLocator = constructionContext.getLocatorFromStack(); - for(unsigned int i = 0; i < nAttrs; i++) + for (XalanSize_t i = 0; i < nAttrs; i++) { const XalanDOMChar* const aname = atts.getName(i); - if(equals(aname, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_METHOD)) + if (equals(aname, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_METHOD)) { const XalanDOMChar* const method = atts.getValue(i); - if(equals(method, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRVAL_OUTPUT_METHOD_HTML)) + if (equals(method, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRVAL_OUTPUT_METHOD_HTML)) { m_outputMethod = FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OUTPUT_METHOD_HTML; } - else if(equals(method, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRVAL_OUTPUT_METHOD_XML)) + else if (equals(method, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRVAL_OUTPUT_METHOD_XML)) { m_outputMethod = FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OUTPUT_METHOD_XML; } - else if(equals(method, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRVAL_OUTPUT_METHOD_TEXT)) + else if (equals(method, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRVAL_OUTPUT_METHOD_TEXT)) { m_outputMethod = FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OUTPUT_METHOD_TEXT; } @@ -510,42 +510,42 @@ theLocator); } } - else if(equals(aname, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_VERSION)) + else if (equals(aname, Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_VERSION)) { m_version = atts.getValue(i); } - else if(equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_INDENT)) + else if (equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_INDENT)) { m_indentResult = getYesOrNo(aname, atts.getValue(i), constructionContext) == true ? eIndentYesExplicit : eIndentNoExplicit; } - else if(equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_ENCODING)) + else if (equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_ENCODING)) { m_encoding = atts.getValue(i); } - else if(equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_MEDIATYPE)) + else if (equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_MEDIATYPE)) { m_mediatype = atts.getValue(i); } - else if(equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_DOCTYPE_SYSTEM)) + else if (equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_DOCTYPE_SYSTEM)) { m_doctypeSystem = atts.getValue(i); } - else if(equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_DOCTYPE_PUBLIC)) + else if (equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_DOCTYPE_PUBLIC)) { m_doctypePublic = atts.getValue(i); } - else if(equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_OMITXMLDECL)) + else if (equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_OMITXMLDECL)) { m_omitxmlDecl = getYesOrNo(aname, atts.getValue(i), constructionContext); } - else if(equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_STANDALONE)) + else if (equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_STANDALONE)) { m_standalone = atts.getValue(i); } - else if(equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS)) + else if (equals(aname,Constants888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS)) { if (m_outputMethod == FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OUTPUT_METHOD_NONE || m_outputMethod == FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OUTPUT_METHOD_XML) @@ -561,7 +561,7 @@ XalanDOMString& theToken = theGuard.get(); - while(theTokenCount > 0) + while (theTokenCount > 0) { theTokenizer.nextToken(theToken); @@ -627,8 +627,8 @@ } // If HTML output - if(m_outputMethod == FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OUTPUT_METHOD_HTML && - m_indentResult == eIndentNoImplicit) + if (m_outputMethod == FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OUTPUT_METHOD_HTML && + m_indentResult == eIndentNoImplicit) { m_indentResult = eIndentYesImplicit; } Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp (original) +++ xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupport.hpp Thu Jul 3 17:28:13 2008 @@ -77,8 +77,8 @@ const ElemTemplateElement* styleNode, const XalanDOMString& msg, const XalanDOMChar* uri, - int lineNo, - int charOffset) const = 0; + XalanFileLoc lineNo, + XalanFileLoc charOffset) const = 0; // These interfaces are inherited from XPathEnvSupport... @@ -126,8 +126,8 @@ const XalanNode* sourceNode, const XalanDOMString& msg, const XalanDOMChar* uri, - int lineNo, - int charOffset) const = 0; + XalanFileLoc lineNo, + XalanFileLoc charOffset) const = 0; // These interfaces are inherited from Resettable... Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp (original) +++ xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp Thu Jul 3 17:28:13 2008 @@ -277,8 +277,8 @@ const ElemTemplateElement* styleNode, const XalanDOMString& msg, const XalanDOMChar* /* uri */, - int /* lineNo */, - int /* charOffset */) const + XalanFileLoc /* lineNo */, + XalanFileLoc /* charOffset */) const { if (classification == XPathEnvSupport888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4rror) { @@ -319,8 +319,8 @@ const XalanNode* sourceNode, const XalanDOMString& msg, const XalanDOMChar* /* uri */, - int /* lineNo */, - int /* charOffset */) const + XalanFileLoc /* lineNo */, + XalanFileLoc /* charOffset */) const { if (classification == XPathEnvSupport888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4rror) { Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp (original) +++ xalan/c/trunk/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp Thu Jul 3 17:28:13 2008 @@ -125,8 +125,8 @@ const ElemTemplateElement* styleNode, const XalanDOMString& msg, const XalanDOMChar* uri, - int lineNo, - int charOffset) const; + XalanFileLoc lineNo, + XalanFileLoc charOffset) const; // These interfaces are inherited from XPathEnvSupport... @@ -174,8 +174,8 @@ const XalanNode* sourceNode, const XalanDOMString& msg, const XalanDOMChar* uri, - int lineNo, - int charOffset) const; + XalanFileLoc lineNo, + XalanFileLoc charOffset) const; // These interfaces are inherited from Resettable... Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp (original) +++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp Thu Jul 3 17:28:13 2008 @@ -591,15 +591,15 @@ static bool hasXMLNamespaceAttribute(const AttributeListType& attrs) { - const unsigned int theLength = attrs.getLength(); + const XalanSize_t theLength = attrs.getLength(); - for (unsigned int i = 0; i < theLength; ++i) + for (XalanSize_t i = 0; i < theLength; ++i) { const XalanDOMChar* const theName = attrs.getName(i); assert(theName != 0); - if(equals(theName, DOMServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4s_XMLNamespacePrefix) == true) + if (equals(theName, DOMServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4s_XMLNamespacePrefix) == true) { return true; } @@ -613,15 +613,15 @@ static bool hasXMLNamespaceAttribute(const AttributesType& attrs) { - const unsigned int theLength = attrs.getLength(); + const XalanSize_t theLength = attrs.getLength(); - for (unsigned int i = 0; i < theLength; ++i) + for (XalanSize_t i = 0; i < theLength; ++i) { const XalanDOMChar* const theName = attrs.getQName(i); assert(theName != 0); - if(equals(theName, DOMServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4s_XMLNamespacePrefix) == true) + if (equals(theName, DOMServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4s_XMLNamespacePrefix) == true) { return true; } @@ -641,10 +641,10 @@ bool fCreateNamespaces, const PrefixResolver* thePrefixResolver) { - const unsigned int theSAXAttributeCount = attrs.getLength(); + const XalanSize_t theSAXAttributeCount = attrs.getLength(); // Now, create the attributes... - for(unsigned int i = 0; i < theSAXAttributeCount; ++i) + for (XalanSize_t i = 0; i < theSAXAttributeCount; ++i) { const XalanDOMChar* const theName = attrs.getName(i); @@ -1445,10 +1445,10 @@ XalanSourceTreeElement* theOwnerElement, bool fCreateNamespaces) { - const unsigned int theSAXAttributeCount = theAttributes.getLength(); + const XalanSize_t theSAXAttributeCount = theAttributes.getLength(); // Now, create the attributes... - for(unsigned int i = 0; i < theSAXAttributeCount; ++i) + for (XalanSize_t i = 0; i < theSAXAttributeCount; ++i) { const XalanDOMChar* const theQName = theAttributes.getQName(i); @@ -1483,7 +1483,8 @@ theAttributes.getLocalName(i); assert(theLocalName != 0); - const XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type theColonIndex = indexOf(theQName, XalanUnico888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4charColon); + const XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type theColonIndex = + indexOf(theQName, XalanUnico888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4charColon); assert(theColonIndex != length(theQName)); // The constructor parameters for AttrNS are: Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (original) +++ xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp Thu Jul 3 17:28:13 2008 @@ -383,18 +383,18 @@ DOMElementType* theElement, AttributeListType& attrs) { - const unsigned int nAtts = attrs.getLength(); + const XalanSize_t nAtts = attrs.getLength(); if (m_prefixResolver == 0) { - for(unsigned int i = 0; i < nAtts; i++) + for (XalanSize_t i = 0; i < nAtts; i++) { theElement->setAttribute(attrs.getName(i), attrs.getValue(i)); } } else { - for(unsigned int i = 0; i < nAtts; i++) + for (XalanSize_t i = 0; i < nAtts; i++) { const XalanDOMChar* const theName = attrs.getName(i); assert(theName != 0); Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp (original) +++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp Thu Jul 3 17:28:13 2008 @@ -1592,7 +1592,7 @@ // Finally, increment the index counter... ++m_currentIndex; - const short theType = node->getNodeType(); + const DOMNodeTyp888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4NodeType theType = node->getNodeType(); if (theType == DOMNodeTyp888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4DOCUMENT_TYPE_NODE) { @@ -1607,10 +1607,10 @@ const DOMNamedNodeMapType* const theEntities = theDoctype->getEntities(); - const unsigned int theLength = + const XalanSize_t theLength = theEntities->getLength(); - for (unsigned int i = 0; i < theLength; ++i) + for (XalanSize_t i = 0; i < theLength; ++i) { // Build it, but don't index it... m_document->createWrapperNode(theEntities->item(i), m_currentIndex++, true); @@ -1630,13 +1630,13 @@ theElement->getAttributes(); assert(theAttributes != 0); - const unsigned int theLength = + const XalanSize_t theLength = theAttributes->getLength(); XercesWrapperNavigator* thePreviousAttrNavigator = 0; XalanNode* thePreviousAttr = 0; - for (unsigned int i = 0; i < theLength; ++i) + for (XalanSize_t i = 0; i < theLength; ++i) { // Get the attribute from the node map... const DOMNodeType* const theAttr = theAttributes->item(i); Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp?rev=673887&r1=673886&r2=673887&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp (original) +++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesParserLiaison.cpp Thu Jul 3 17:28:13 2008 @@ -693,8 +693,8 @@ XalanDOMString theLineNumber(theMessage.getMemoryManager()); XalanDOMString theColumnNumb(theMessage.getMemoryManager()); - LongToDOMString(e.getLineNumber(), theLineNumber); - LongToDOMString(e.getColumnNumber(), theColumnNumb); + NumberToDOMString(e.getLineNumber(), theLineNumber); + NumberToDOMString(e.getColumnNumber(), theColumnNumb); XalanDOMString theErrorMsg(theMessage.getMemoryManager()); --------------------------------------------------------------------- To unsubscribe, e-mail: dfranklin@example.org For additional commands, e-mail: dfranklin@example.org From xalandfranklin@example.org Sun Jul 13 06:17:27 2008 Return-Path: <xalandfranklin@example.org> Delivered-To: dfranklin@example.org Received: (qmail 89504 invoked from network); 13 Jul 2008 06:17:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 13 Jul 2008 06:17:27 -0000 Received: (qmail 68980 invoked by uid 500); 13 Jul 2008 06:17:27 -0000 Delivered-To: dfranklin@example.org Received: (qmail 68951 invoked by uid 500); 13 Jul 2008 06:17:27 -0000 Mailing-List: contact dfranklin@example.org; run by ezmlm Precedence: bulk list-help: <mailto:dfranklin@example.org> list-unsubscribe: <mailto:dfranklin@example.org> List-Post: <mailto:dfranklin@example.org> Reply-To: <dfranklin@example.org> List-Id: <xalan-cvs.xml.apache.org> Delivered-To: mailing list dfranklin@example.org Received: (qmail 68941 invoked by uid 99); 13 Jul 2008 06:17:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Jul 2008 23:17:27 -0700 X-ASF-Spam-Status: No, hits=-1998.9 required=10.0 tests=ALL_TRUSTED,FB_GET_MEDS X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Jul 2008 06:16:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E8C4C2388A41; Sat, 12 Jul 2008 23:17:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r676264 [3/11] - in /xalan/c/trunk: Projects/Win32/Res/Localization/ Projects/Win32/VC6/AllInOne/ Projects/Win32/VC7.1/AllInOne/ Projects/Win32/VC7/AllInOne/ Projects/Win32/VC8/AllInOne/ Projects/Win32/VC8/CompileStylesheet/ Projects/Win32/... Date: Sun, 13 Jul 2008 06:16:50 -0000 To: dfranklin@example.org From: dfranklin@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <dfranklin@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original) +++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Sat Jul 12 23:16:42 2008 @@ -1022,7 +1022,7 @@ } // Compare the lines character by charcter .... - unsigned int i = 0; + XalanSize_t i = 0; while(i < strlen(gline)) { if (gline[i] == rline[i]) @@ -1536,8 +1536,8 @@ const XalanNamedNodeMap* const docAttrs = doc.getAttributes(); // Get number of Attributes - const unsigned int numGoldAttr = goldAttrs->getLength(); - const unsigned int numDomAttr = docAttrs ->getLength(); + const XalanSize_t numGoldAttr = goldAttrs->getLength(); + const XalanSize_t numDomAttr = docAttrs ->getLength(); /* // This needs to be uncommented if 'compare.exe' is to work. @@ -1554,8 +1554,7 @@ if ( numGoldAttr == numDomAttr ) { // Compare Attributes one at a time. - //for (int i=1; i < numGoldAttr; i++) // To be used with 'compare' - for (unsigned int i = 0; i < numGoldAttr; ++i) + for (XalanSize_t i = 0; i < numGoldAttr; ++i) { // Attribute order is irrelvant, so comparision is base on Attribute name. const XalanNode* const gAttr = goldAttrs->item(i); @@ -1588,8 +1587,8 @@ collectData( "Wrong number of attributes. ", docNodeName, - UnsignedLongToDOMString(numGoldAttr, numGoldStr), - UnsignedLongToDOMString(numDomAttr, numDOMStr)); + NumberToDOMString(numGoldAttr, numGoldStr), + NumberToDOMString(numDomAttr, numDOMStr)); return false; } @@ -1694,17 +1693,16 @@ assert(docAttrs != 0); // Get number of Attributes - const unsigned int numGoldAttr = goldAttrs->getLength(); - const unsigned int numDomAttr = docAttrs ->getLength(); + const XalanSize_t numGoldAttr = goldAttrs->getLength(); + const XalanSize_t numDomAttr = docAttrs ->getLength(); // Check that each Element has same number of Attributes. If they don't report error if ( numGoldAttr == numDomAttr ) { // Compare Attributes one at a time. - //for (int i=1; i < numGoldAttr; i++) // To be used with 'compare' - for (unsigned int i = 0; i < numGoldAttr; ++i) + for (XalanSize_t i = 0; i < numGoldAttr; ++i) { - // Attribute order is irrelvant, so comparision is base on Attribute name. + // Attribute order is irrelevant, so comparision is base on Attribute name. const XalanNode* const gAttr = goldAttrs->item(i); const XalanDOMString& goldAttrName = gAttr->getNodeName(); @@ -1735,8 +1733,8 @@ collectData( "Wrong number of attributes. ", docNodeName, - UnsignedLongToDOMString(numGoldAttr, numGoldStr), - UnsignedLongToDOMString(numDomAttr, numDOMStr)); + NumberToDOMString(numGoldAttr, numGoldStr), + NumberToDOMString(numDomAttr, numDOMStr)); return false; } Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp (original) +++ xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp Sat Jul 12 23:16:42 2008 @@ -43,12 +43,12 @@ #if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH) inline void doCopyData( - const XalanDOMChar* theString, - unsigned int theStringLength, - XalanDOMChar* theBuffer) + const XalanDOMChar* theString, + XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type theStringLength, + XalanDOMChar* theBuffer) { // Copy the data, truncating each character... - for (unsigned int i = 0; i < theStringLength; ++i) + for (XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type i = 0; i < theStringLength; ++i) { // There should be no truncation, since XalanDOMChars // hold UTF-16 code points, but assert, just in case... @@ -63,13 +63,14 @@ // Use a stack-based buffer up to this size. -const unsigned int theStackBufferSize = 200u; +const XalanSize_t theStackBufferSize = 200u; const UnicodeString -ICUBridg888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XalanDOMCharStringToUnicodeString(MemoryManagerType& theManager, - const XalanDOMChar* theString) +ICUBridg888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XalanDOMCharStringToUnicodeString( + MemoryManagerType& theManager, + const XalanDOMChar* theString) { if (theString == 0) { @@ -146,8 +147,9 @@ const UnicodeString -ICUBridg888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XalanDOMStringToUnicodeString(MemoryManagerType& theManager, - const XalanDOMString& theString) +ICUBridg888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XalanDOMStringToUnicodeString( + MemoryManagerType& theManager, + const XalanDOMString& theString) { // Just call up to the XalanDOMChar* version... return XalanDOMCharStringToUnicodeString(theManager, c_wstr(theString), length(theString)); @@ -157,8 +159,8 @@ XalanDOMString& ICUBridg888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnicodeStringToXalanDOMString( - const UnicodeString& theString, - XalanDOMString& theResult) + const UnicodeString& theString, + XalanDOMString& theResult) { const int32_t theLength = theString.length(); Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp (original) +++ xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp Sat Jul 12 23:16:42 2008 @@ -240,7 +240,7 @@ // Since language names must be ASCII, this // is the cheapest way to "transcode"... - for (unsigned int i = 0; i <= theLength; ++i) + for (XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type i = 0; i <= theLength; ++i) { theBuffer[i] = char(theLocale[i]); } Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp (original) +++ xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.cpp Sat Jul 12 23:16:42 2008 @@ -126,24 +126,27 @@ -#if defined(XALAN_SIZE_T_NOT_STANDARD_TYPE) - - /** - * Format a number into a string. - * - * @param theValue number to format - * @param theResult the string result - */ XalanDOMString& ICUXalanNumberFormatProxy888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ormat( - size_t theValue, + XALAN_UINT64 theValue, XalanDOMString& theResult) { // $$$ ToDo: Fix this! return format(static_cast<unsigned long>(theValue), theResult); } -#endif + + + +XalanDOMString& +ICUXalanNumberFormatProxy888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ormat( + XALAN_INT64 theValue, + XalanDOMString& theResult) + +{ + // $$$ ToDo: Fix this! + return format(static_cast<long>(theValue), theResult); +} Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp (original) +++ xalan/c/trunk/src/xalanc/ICUBridge/ICUXalanNumberFormatProxy.hpp Sat Jul 12 23:16:42 2008 @@ -50,27 +50,33 @@ ~ICUXalanNumberFormatProxy(); virtual XalanDOMString& - format(double theValue, - XalanDOMString& theResult); + format( + double theValue, + XalanDOMString& theResult); virtual XalanDOMString& - format(int theValue, - XalanDOMString& theResult); + format( + int theValue, + XalanDOMString& theResult); virtual XalanDOMString& - format(unsigned int theValue, XalanDOMString& theResult); + format( + unsigned int theValue, + XalanDOMString& theResult); virtual XalanDOMString& - format(long theValue, XalanDOMString& theResult); + format( + long theValue, + XalanDOMString& theResult); virtual XalanDOMString& - format(unsigned long theValue, XalanDOMString& theResult); - -#if defined(XALAN_SIZE_T_NOT_STANDARD_TYPE) + format( + unsigned long theValue, + XalanDOMString& theResult); /** * Format a number into a string. @@ -80,10 +86,19 @@ */ virtual XalanDOMString& format( - size_t theValue, + XALAN_INT64 theValue, XalanDOMString& theResult); -#endif + /** + * Format a number into a string. + * + * @param theValue number to format + * @param theResult the string result + */ + virtual XalanDOMString& + format( + XALAN_UINT64 theValue, + XalanDOMString& theResult); virtual bool isGroupingUsed() const; Modified: xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp (original) +++ xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp Sat Jul 12 23:16:42 2008 @@ -129,7 +129,8 @@ typedef XMLFileLoc XalanFileLoc; #endif -typedef XMLCh XalanDOMChar; +typedef XMLCh XalanDOMChar; +typedef unsigned int XalanUnicodeChar; template<bool value> struct XalanCompileErrorBoolean @@ -140,6 +141,11 @@ XALAN_CPP_NAMESPACE_END +#if !defined(XALAN_NO_LONG_LONG) +typedef unsigned long long XALAN_UINT64; +typedef long long XALAN_INT64; +#endif + #define XALAN_STATIC_ASSERT(expr) XALAN_CPP_NAMESPACE_QUALIFIER XalanCompileErrorBoolean<bool(expr)>() Modified: xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp (original) +++ xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp Sat Jul 12 23:16:42 2008 @@ -19,8 +19,9 @@ #define VCPPDEFINITIONS_HEADER_GUARD_1357924680 -#pragma warning(disable: 4127 4251 4345 4351 4511 4512 4514 4521 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715) +#pragma warning(disable: 4127 4146 4251 4345 4351 4355 4511 4512 4514 4521 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715) +#include <basetsd.h> // --------------------------------------------------------------------------- // A define in the build for each project is also used to control whether @@ -58,9 +59,12 @@ #define XALAN_HAS_STD_DISTANCE #define XALAN_NO_REENTRANT_TIME_FUNCTIONS -#if defined(_WIN64) -#define XALAN_SIZE_T_NOT_STANDARD_TYPE -#endif +// long long is not supported on all MS compilers. +#define XALAN_NO_LONG_LONG + +typedef UINT64 XALAN_UINT64; +typedef INT64 XALAN_INT64; + #define XALAN_WINDOWS #if defined(_DEBUG) && defined(NDEBUG) Modified: xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp (original) +++ xalan/c/trunk/src/xalanc/Include/XalanMemoryManagement.hpp Sat Jul 12 23:16:42 2008 @@ -38,8 +38,8 @@ -typedef XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager MemoryManagerType; XALAN_USING_XERCES(MemoryManager) +typedef MemoryManager MemoryManagerType; Modified: xalan/c/trunk/src/xalanc/Include/XalanObjectCache.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanObjectCache.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Include/XalanObjectCache.hpp (original) +++ xalan/c/trunk/src/xalanc/Include/XalanObjectCache.hpp Sat Jul 12 23:16:42 2008 @@ -131,7 +131,7 @@ explicit XalanObjectCache( MemoryManagerType& theManager, - unsigned int initialListSize = 0) : + XalanSize_t initialListSize = 0) : m_availableList(theManager), m_busyList(theManager) { @@ -273,8 +273,8 @@ typedef ObjectType CacheObjectType; explicit - XalanObjectCache(MemoryManagerType& theManager, - unsigned int initialListSize = 0) : + XalanObjectCache(MemoryManagerType& theManager, + XalanSize_t initialListSize = 0) : m_deleteFunctor(theManager), m_availableList(theManager) { @@ -425,7 +425,7 @@ explicit XalanObjectCacheDefault( MemoryManagerType& theManager, - unsigned int initialListSize = 0) : + XalanSize_t initialListSize = 0) : BaseClassType(theManager, initialListSize) { } @@ -452,7 +452,7 @@ explicit XalanMemoryManagerObjectCacheDefault( MemoryManagerType& theManager, - unsigned int initialListSize = 0) : + XalanSize_t initialListSize = 0) : BaseClassType(theManager, initialListSize) { } Modified: xalan/c/trunk/src/xalanc/Include/XalanObjectStackCache.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanObjectStackCache.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Include/XalanObjectStackCache.hpp (original) +++ xalan/c/trunk/src/xalanc/Include/XalanObjectStackCache.hpp Sat Jul 12 23:16:42 2008 @@ -54,15 +54,15 @@ typedef ObjectType CacheObjectType; explicit - XalanObjectStackCache(MemoryManagerType& theManager, - unsigned int initialListSize = 0) : + XalanObjectStackCache( + MemoryManagerType& theManager, + XalanSize_t initialListSize = 0) : m_createFunctor(), m_deleteFunctor(theManager), - m_stack(theManager), + m_stack(theManager), m_numObjectsOnStack(0) { m_stack.reserve(initialListSize); - } ~XalanObjectStackCache() @@ -154,7 +154,7 @@ typedef XalanObjectStackCache<ObjectType, DefaultCacheCreateFunctor<ObjectType>, DeleteFunctor<ObjectType>, DefaultCacheResetFunctor<ObjectType> > BaseClassType; explicit - XalanObjectStackCacheDefault(unsigned int initialListSize = 0) : + XalanObjectStackCacheDefault(XalanSize_t initialListSize = 0) : BaseClassType(initialListSize) { } Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp Sat Jul 12 23:16:42 2008 @@ -63,6 +63,12 @@ +#if defined (XALAN_STRICT_ANSI_HEADERS) + using st888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_t; +#endif + + + // The maximum number of digits that sprintf can put in a buffer. // 100 for now. We're using this because we want to avoid transcoding // number strings when we don't have to, @@ -340,6 +346,7 @@ XALAN_USING_STD(ostream) +XALAN_USING_STD(streamsize) XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(void) OutputString( @@ -348,7 +355,12 @@ { if (theString.empty() == false) { - theStream.write(&*theString.begin(), theString.size()); + assert( + static_cast<XALAN_UINT64>(static_cast<streamsize>(theString.size())) == theString.size()); + + theStream.write( + &*theString.begin(), + static_cast<streamsize>(theString.size())); } } @@ -1345,7 +1357,7 @@ XALAN_USING_STD(sprintf); #endif - unsigned int theCharsWritten = sprintf(theBuffer, "%p", theValue); + const int theCharsWritten = sprintf(theBuffer, "%p", theValue); assert(theCharsWritten != 0); reserve(theResult, length(theResult) + theCharsWritten); @@ -1784,7 +1796,27 @@ XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) NumberToDOMString( - unsigned long long theValue, + XALAN_INT64 theValue, + XalanDOMString& theResult) +{ + return ScalarToDecimalString(theValue, theResult); +} + + + +XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) +NumberToDOMString( + XALAN_UINT64 theValue, + XalanDOMString& theResult) +{ + return ScalarToDecimalString(theValue, theResult); +} + + + +XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) +NumberToDOMString( + unsigned long theValue, XalanDOMString& theResult) { return ScalarToDecimalString(theValue, theResult); Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp Sat Jul 12 23:16:42 2008 @@ -766,7 +766,7 @@ /** - * Converts an unsigned long long value into a XalanDOMString + * Converts an 64-bit signed value into a XalanDOMString * * @param theValue number to be converted * @param theResult the string to append with the result @@ -774,7 +774,33 @@ */ XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) NumberToDOMString( - unsigned long long theValue, + XALAN_INT64 theValue, + XalanDOMString& theResult); + +/** + * Converts an 64-bit unsigned value into a XalanDOMString + * + * @param theValue number to be converted + * @param theResult the string to append with the result + * @return a reference to the passed string result. + */ +XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) +NumberToDOMString( + XALAN_UINT64 theValue, + XalanDOMString& theResult); + + + +/** + * Converts an unsigned long value into a XalanDOMString + * + * @param theValue number to be converted + * @param theResult the string to append with the result + * @return a reference to the passed string result. + */ +XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) +NumberToDOMString( + unsigned long theValue, XalanDOMString& theResult); @@ -789,7 +815,11 @@ */ XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&) SizeTypeToDOMString( - size_t theValue, +#if defined (XALAN_STRICT_ANSI_HEADERS) + st888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_t theValue, +#else + size_t theValue, +#endif XalanDOMString& theResult); Modified: xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp Sat Jul 12 23:16:42 2008 @@ -66,12 +66,14 @@ } else { + XALAN_USING_STD(streamsize) + + assert(static_cast<XALAN_UINT64>(static_cast<streamsize>(maxToRead)) == maxToRead); + #if !defined(XALAN_CLASSIC_IOSTREAMS) -#if defined(XALAN_OLD_STYLE_CASTS) - m_stream.read((char*)toFill, maxToRead); -#else - m_stream.read(reinterpret_cast<char*>(toFill), maxToRead); -#endif + m_stream.read( + reinterpret_cast<char*>(toFill), + static_cast<streamsize>(maxToRead)); #else m_stream.read(toFill, maxToRead); #endif Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringCache.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringCache.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringCache.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringCache.cpp Sat Jul 12 23:16:42 2008 @@ -35,7 +35,7 @@ XalanDOMStringCach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XalanDOMStringCache( MemoryManagerType& theManager, - unsigned int theMaximumSize) : + XalanSize_t theMaximumSize) : m_availableList(theManager), m_busyList(theManager), m_maximumSize(theMaximumSize), Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringCache.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringCache.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringCache.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringCache.hpp Sat Jul 12 23:16:42 2008 @@ -45,24 +45,25 @@ { public: - enum { eDefaultMaximumSize = 100 }; + enum { eDefaultMaximumSize = 100u }; typedef XalanVector<XalanDOMString*> StringListType; explicit - XalanDOMStringCache(MemoryManagerType& theManager, - unsigned int theMaximumSize = eDefaultMaximumSize); + XalanDOMStringCache( + MemoryManagerType& theManager, + XalanSize_t theMaximumSize = eDefaultMaximumSize); ~XalanDOMStringCache(); - unsigned int + XalanSize_t getMaximumSize() const { return m_maximumSize; } void - setMaximumSize(unsigned int theSize) + setMaximumSize(XalanSize_t theSize) { m_maximumSize = theSize; } @@ -137,7 +138,7 @@ */ StringListType m_busyList; - unsigned int m_maximumSize; + XalanSize_t m_maximumSize; XalanDOMStringReusableAllocator m_allocator; }; Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanDOMStringHashTable.hpp Sat Jul 12 23:16:42 2008 @@ -135,7 +135,7 @@ * * @param theString The string to find. * @param theLength The number of characters in the string. - * @param theBucketIndex A pointer to an unsigned int to get the bucket index + * @param theBucketIndex A pointer to a parameter to get the bucket index * @return a pointer to the string, or null if not found. */ const XalanDOMString* @@ -239,7 +239,7 @@ size_t m_count; - unsigned int m_collisions; + size_t m_collisions; }; Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp Sat Jul 12 23:16:42 2008 @@ -44,7 +44,7 @@ bool -XalanEncodingPropertyCach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4canEncodeCharacter(unsigned int theChar) const +XalanEncodingPropertyCach888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4canEncodeCharacter(XalanUnicodeChar theChar) const { if (theChar > m_presentBitmap.getSize()) { Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.hpp Sat Jul 12 23:16:42 2008 @@ -53,7 +53,7 @@ ~XalanEncodingPropertyCache(); bool - canEncodeCharacter(unsigned int theChar) const; + canEncodeCharacter(XalanUnicodeChar theChar) const; const XalanOutputTranscoder* getTranscoder() const Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.cpp Sat Jul 12 23:16:42 2008 @@ -35,8 +35,8 @@ XalanFStreamOutputStream888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XalanFStreamOutputStream( FILE* theHandle, - MemoryManagerType& theManager, - unsigned int theBufferSize) : + MemoryManagerType& theManager, + size_type theBufferSize) : XalanOutputStream(theManager, theBufferSize), m_handle(theHandle) { @@ -48,8 +48,8 @@ XalanFStreamOutputStream* XalanFStreamOutputStream888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reate( FILE* theFileHandle, - MemoryManagerType& theManager, - unsigned int theBufferSize) + MemoryManagerType& theManager, + size_type theBufferSize) { typedef XalanFStreamOutputStream ThisType; Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFStreamOutputStream.hpp Sat Jul 12 23:16:42 2008 @@ -42,7 +42,7 @@ { public : - enum { eDefaultBufferSize = 8192 }; + enum { eDefaultBufferSize = 8192u }; /** @@ -53,13 +53,14 @@ */ XalanFStreamOutputStream( FILE* theFileHandle, - MemoryManagerType& theManager, - unsigned int theBufferSize = eDefaultBufferSize); + MemoryManagerType& theManager, + size_type theBufferSize = eDefaultBufferSize); static XalanFStreamOutputStream* - create( FILE* theFileHandle, - MemoryManagerType& theManager, - unsigned int theBufferSize = eDefaultBufferSize); + create( + FILE* theFileHandle, + MemoryManagerType& theManager, + size_type theBufferSize = eDefaultBufferSize); virtual ~XalanFStreamOutputStream(); Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp Sat Jul 12 23:16:42 2008 @@ -194,7 +194,7 @@ XalanFileOutputStream888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XalanFileOutputStream( const XalanDOMString& theFileName, MemoryManagerType& theManager, - unsigned int theBufferSize) : + size_type theBufferSize) : XalanOutputStream(theManager, theBufferSize), m_fileName(theFileName, theManager), m_handle(openFile(theFileName, theManager)) @@ -226,7 +226,7 @@ XalanFileOutputStream888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reate( const XalanDOMString& theFileName, MemoryManagerType& theManager, - unsigned int theBufferSize) + size_type theBufferSize) { typedef XalanFileOutputStream ThisType; Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanFileOutputStream.hpp Sat Jul 12 23:16:42 2008 @@ -46,7 +46,7 @@ { public : - enum { eDefaultBufferSize = 8192 }; + enum { eDefaultBufferSize = 8192u }; #if defined(XALAN_WINDOWS) typedef HANDLE HandleType; @@ -63,13 +63,13 @@ XalanFileOutputStream( const XalanDOMString& theFileName, MemoryManagerType& theManager, - unsigned int theBufferSize = eDefaultBufferSize); + size_type theBufferSize = eDefaultBufferSize); static XalanFileOutputStream* create( const XalanDOMString& theFileName, MemoryManagerType& theManager, - unsigned int theBufferSize = eDefaultBufferSize); + size_type theBufferSize = eDefaultBufferSize); virtual ~XalanFileOutputStream(); Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp Sat Jul 12 23:16:42 2008 @@ -163,12 +163,11 @@ -bool XalanICUMessageLoader888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4loadMsg(XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad - , XalanDOMChar* toFill - , unsigned int maxChars) +bool XalanICUMessageLoader888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4loadMsg( + XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, + XalanDOMChar* toFill, + XalanSize_t maxChars) { - - bool bResult = true; UErrorCode err = U_ZERO_ERROR; int32_t strLen = 0; @@ -183,7 +182,8 @@ return false; } - const unsigned int retStrLen = unsigned(strLen + 1 ) > maxChars ? maxChars : unsigned(strLen + 1); + const XalanSize_t retStrLen = + static_cast<XalanSize_t>(strLen + 1 ) > maxChars ? maxChars : static_cast<XalanSize_t>(strLen + 1); XalanCopy(name, name + retStrLen, toFill); Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.hpp Sat Jul 12 23:16:42 2008 @@ -47,14 +47,15 @@ ~XalanICUMessageLoader(); protected: - // ----------------------------------------------------------------------- + + // ----------------------------------------------------------------------- // Implementation of the virtual message loader API // ----------------------------------------------------------------------- - virtual bool loadMsg - ( - XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad - , XalanDOMChar* toFill - , unsigned int maxChars + virtual bool + loadMsg( + XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, + XalanDOMChar* toFill, + XalanSize_t maxChars ); private: Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.cpp Sat Jul 12 23:16:42 2008 @@ -37,42 +37,39 @@ bool XalanInMemoryMessageLoader888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4loadMsg( - XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad - , XalanDOMChar* toFill - , unsigned int maxChars ) + XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, + XalanDOMChar* toFill, + XalanSize_t maxChars) { - if ( toFill == 0 ) + if (toFill == 0) { return false; } - else + else if (XalanMsgContainer888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getMessageCount() < static_cast<XalanSize_t>(msgToLoad)) { - if (XalanMsgContainer888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getNumbOfMsgs() < (unsigned int)msgToLoad) - { - const XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type msgLength = - m_unknownMessage.length() + 1; - - XalanCopy( - m_unknownMessage.c_str(), - m_unknownMessage.c_str() + (msgLength < maxChars ? msgLength : maxChars), - toFill); - } - else - { - const XalanDOMChar* const pErrMsg = XalanMsgContainer888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getMessage(msgToLoad); - assert (pErrMsg != 0); - - const XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type msgLength = - XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4length(pErrMsg) + 1; - - XalanCopy( - pErrMsg, - pErrMsg + (msgLength < maxChars ? msgLength : maxChars), - toFill); - } + const XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type msgLength = + m_unknownMessage.length() + 1; - return true; + XalanCopy( + m_unknownMessage.c_str(), + m_unknownMessage.c_str() + (msgLength < maxChars ? msgLength : maxChars), + toFill); } + else + { + const XalanDOMChar* const pErrMsg = XalanMsgContainer888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getMessage(msgToLoad); + assert(pErrMsg != 0); + + const XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type msgLength = + XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4length(pErrMsg) + 1; + + XalanCopy( + pErrMsg, + pErrMsg + (msgLength < maxChars ? msgLength : maxChars), + toFill); + } + + return true; } @@ -89,6 +86,9 @@ } + XALAN_CPP_NAMESPACE_END + + #endif Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanInMemoryMessageLoader.hpp Sat Jul 12 23:16:42 2008 @@ -48,11 +48,11 @@ // ----------------------------------------------------------------------- // Implementation of the virtual message loader API // ----------------------------------------------------------------------- - virtual bool loadMsg - ( - XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad - , XalanDOMChar* toFill - , unsigned int maxChars + virtual bool + loadMsg( + XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, + XalanDOMChar* toFill, + XalanSize_t maxChars ); Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagement.cpp Sat Jul 12 23:16:42 2008 @@ -16,40 +16,47 @@ * limitations under the License. */ -#include <xalanc/Include/XalanMemoryManagement.hpp> +#include "xalanc/Include/XalanMemoryManagement.hpp" + + + +#include "xercesc/util/PlatformUtils.hpp" +#include "xercesc/util/OutOfMemoryException.hpp" + -#include <xercesc/util/PlatformUtils.hpp> #include <cassert> #include <new> + + XALAN_CPP_NAMESPACE_BEGIN -class XalanDummyMemoryManager : public MemoryManagerType + + +class XalanDummyMemoryManager : public MemoryManager { public: - virtual + + virtual ~XalanDummyMemoryManager() { } - + virtual void* - allocate( size_t /* size, */ ) + allocate(XalanSize_t /* size */ ) { - XALAN_USING_STD(bad_alloc) - - throw bad_alloc(); - - return 0; + XALAN_USING_XERCES(OutOfMemoryException) + + throw OutOfMemoryException(); } virtual void - deallocate( void* /* pDataPointer */ ) + deallocate(void* /* pDataPointer */ ) { - XALAN_USING_STD(bad_alloc) - - throw bad_alloc(); - + XALAN_USING_XERCES(OutOfMemoryException) + + throw OutOfMemoryException(); } MemoryManager* @@ -63,31 +70,26 @@ static XalanDummyMemoryManager s_dummyMemMgr; -MemoryManagerType& + + +MemoryManager& XalanMemMgrs888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getDummyMemMgr() { return s_dummyMemMgr; } -MemoryManagerType& + +MemoryManager& XalanMemMgrs888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getDefaultXercesMemMgr() { XALAN_USING_XERCES(XMLPlatformUtils) - - MemoryManagerType* ptr = XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager; - - assert (ptr != 0); - - return *ptr; -} - + assert(XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager != 0); - - -XALAN_CPP_NAMESPACE_END - + return *XMLPlatformUtils888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4gMemoryManager; +} +XALAN_CPP_NAMESPACE_END Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.cpp Sat Jul 12 23:16:42 2008 @@ -43,7 +43,7 @@ void* -XalanMemoryManagerDefault888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4llocate(size_t size) +XalanMemoryManagerDefault888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4llocate(XalanSize_t size) { XALAN_USING_XERCES(OutOfMemoryException) Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMemoryManagerDefault.hpp Sat Jul 12 23:16:42 2008 @@ -49,7 +49,7 @@ ~XalanMemoryManagerDefault(); virtual void* - allocate(size_t size); + allocate(XalanSize_t size); virtual void deallocate(void* pointer); Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.cpp Sat Jul 12 23:16:42 2008 @@ -201,7 +201,7 @@ XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, MemoryManager& theMemoryManager, XalanDOMChar* toFill, - unsigned int maxChars, + XalanSize_t maxChars, const XalanDOMChar* repText1, const XalanDOMChar* repText2, const XalanDOMChar* repText3, @@ -289,7 +289,7 @@ XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, MemoryManagerType& theManager, XalanDOMChar* toFill, - unsigned int maxChars, + XalanSize_t maxChars, const char* repText1, const char* repText2, const char* repText3, Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanMessageLoader.hpp Sat Jul 12 23:16:42 2008 @@ -141,7 +141,7 @@ loadMsg( XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, XalanDOMChar* toFill, - unsigned int maxChars) = 0; + XalanSize_t maxChars) = 0; private: @@ -150,7 +150,7 @@ XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, MemoryManager& theMemoryManager, XalanDOMChar* toFill, - unsigned int maxChars, + XalanSize_t maxChars, const XalanDOMChar* repText1, const XalanDOMChar* repText2 = 0, const XalanDOMChar* repText3 = 0, @@ -161,7 +161,7 @@ XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, MemoryManagerType& theManager, XalanDOMChar* toFill, - unsigned int maxChars, + XalanSize_t maxChars, const char* repText1 , const char* repText2 = 0, const char* repText3 = 0, Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp Sat Jul 12 23:16:42 2008 @@ -77,7 +77,7 @@ */ m_catalogHandle = catopen(fileName, 0); - if ((int)m_catalogHandle == -1) + if (reinterpret_cast<int>(m_catalogHandle) == -1) { // Probably have to call panic here // the user will get an error with retrieving messages @@ -85,31 +85,38 @@ } } -bool XalanNLSMessageLoader888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4loadMsg(XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad - , XalanDOMChar* toFill - , unsigned int maxChars) +bool +XalanNLSMessageLoader888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4loadMsg( + XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad + XalanDOMChar* toFill + XalanSize_t maxChars) { bool bRetValue = false; - if( toFill == 0 || maxChars == 0 ) + if (toFill == 0 || maxChars == 0) { return bRetValue; } - if ((int)m_catalogHandle == -1) + if (static_cast<int>(m_catalogHandle) == -1) { // for transcoding to Unicode const XalanDOMString errorMsg("Message can't be retrieved: the message catalog is not open.", m_memoryManager ); if(errorMsg.length() < maxChars) { - XalanCopy(errorMsg.c_str(), errorMsg.c_str()+ errorMsg.length() +1 , toFill); + XalanCopy(errorMsg.c_str(), errorMsg.c_str()+ errorMsg.length() + 1 , toFill); } } else { - const char* const catMessage = catgets( m_catalogHandle, 1, (int)msgToLoad+2, s_errorMessage); + const char* const catMessage = + catgets( + m_catalogHandle, + 1, + static_cast<int>(msgToLoad) + 2, + s_errorMessage); // catgets returns a pointer to msgString if it fails to locate the message // from the message catalog @@ -117,7 +124,7 @@ { const XalanDOMString errorMsg(catMessage, m_memoryManager); - if(errorMsg.length() < maxChars) + if (errorMsg.length() < maxChars) { XalanCopy(errorMsg.c_str(), errorMsg.c_str() + errorMsg.length() +1 , toFill); @@ -129,9 +136,10 @@ return bRetValue; } -XALAN_CPP_NAMESPACE_END -#endif // XALAN_NLS_MSG_LOADER +XALAN_CPP_NAMESPACE_END + +#endif // XALAN_NLS_MSG_LOADER Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNLSMessageLoader.hpp Sat Jul 12 23:16:42 2008 @@ -38,14 +38,15 @@ ~XalanNLSMessageLoader(); protected: - // ----------------------------------------------------------------------- + + // ----------------------------------------------------------------------- // Implementation of the virtual message loader API // ----------------------------------------------------------------------- - virtual bool loadMsg - ( - XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad - , XalanDOMChar* toFill - , unsigned int maxChars + virtual bool + loadMsg( + XalanMessages888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4odes msgToLoad, + XalanDOMChar* toFill, + XalanSize_t maxChars ); private: Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp Sat Jul 12 23:16:42 2008 @@ -63,7 +63,6 @@ double theValue, XalanDOMString& theResult) { - // $$$ ToDo: Fix this! DoubleToDOMString(theValue, theResult); applyGrouping(theResult, theResult); @@ -94,7 +93,6 @@ unsigned int theValue, XalanDOMString& theResult) { - // $$$ ToDo: Fix this! UnsignedLongToDOMString(theValue, theResult); applyGrouping(theResult, theResult); @@ -111,7 +109,6 @@ long theValue, XalanDOMString& theResult) { - // $$$ ToDo: Fix this! LongToDOMString(theValue, theResult); applyGrouping(theResult, theResult); @@ -128,7 +125,6 @@ unsigned long theValue, XalanDOMString& theResult) { - // $$$ ToDo: Fix this! UnsignedLongToDOMString(theValue, theResult); applyGrouping(theResult, theResult); @@ -138,21 +134,26 @@ -#if defined(XALAN_SIZE_T_NOT_STANDARD_TYPE) - - /** - * Format a number into a string. - * - * @param theValue number to format - * @param theResult the string result - */ XalanDOMString& XalanNumberFormat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ormat( - size_t theValue, + XALAN_INT64 theValue, XalanDOMString& theResult) +{ + NumberToDOMString(theValue, theResult); + + applyGrouping(theResult, theResult); + + return theResult; +} + + +XalanDOMString& +XalanNumberFormat888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ormat( + XALAN_UINT64 theValue, + XalanDOMString& theResult) { - SizeTypeToDOMString(theValue, theResult); + NumberToDOMString(theValue, theResult); applyGrouping(theResult, theResult); @@ -161,7 +162,6 @@ -#endif /* * Convert a string value using the currently active values for grouping size * and separator; returns the converted string Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.hpp Sat Jul 12 23:16:42 2008 @@ -117,8 +117,6 @@ unsigned long theValue, XalanDOMString& theResult); -#if defined(XALAN_SIZE_T_NOT_STANDARD_TYPE) - /** * Format a number into a string. * @@ -127,10 +125,19 @@ */ virtual XalanDOMString& format( - size_t theValue, + XALAN_INT64 theValue, XalanDOMString& theResult); -#endif + /** + * Format a number into a string. + * + * @param theValue number to format + * @param theResult the string result + */ + virtual XalanDOMString& + format( + XALAN_UINT64 theValue, + XalanDOMString& theResult); /** * Whether groupings are used for numbers, for example, "234,678" Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp Sat Jul 12 23:16:42 2008 @@ -307,7 +307,7 @@ bool -XalanOutputStream888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4nTranscodeTo(unsigned int theChar) const +XalanOutputStream888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4nTranscodeTo(XalanUnicodeChar theChar) const { if (m_transcoder != 0) { @@ -320,7 +320,6 @@ // commented out line, if we can ever figure out how to see // if a character can be encoded. return true; -// return XalanTranscodingServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4nTranscodeToLocalCodePage(theChar); } } Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.hpp Sat Jul 12 23:16:42 2008 @@ -55,7 +55,6 @@ typedef XalanVector<XalanDOMChar> BufferType; typedef XalanVector<char> TranscodeVectorType; typedef XalanTranscodingServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type size_type; - typedef XalanTranscodingServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnicodeCharType UnicodeCharType; /** * Constructor. @@ -238,7 +237,7 @@ * @return true if the value can be represented, and false if not. */ bool - canTranscodeTo(UnicodeCharType theChar) const; + canTranscodeTo(XalanUnicodeChar theChar) const; const XalanOutputTranscoder* Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanReferenceCountedObject.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanReferenceCountedObject.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanReferenceCountedObject.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanReferenceCountedObject.hpp Sat Jul 12 23:16:42 2008 @@ -65,7 +65,7 @@ virtual void dereferenced() = 0; - virtual unsigned int + virtual XalanSize_t getReferenceCount() const { return m_referenceCount; @@ -73,7 +73,7 @@ private: - unsigned int m_referenceCount; + XalanSize_t m_referenceCount; // Not implemented... XalanReferenceCountedObject& Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanStdOutputStream.cpp Sat Jul 12 23:16:42 2008 @@ -146,7 +146,7 @@ const char* theBuffer, size_type theBufferLength) { - assert(StreamSizeType(theBufferLength) == theBufferLength); + assert(static_cast<XALAN_UINT64>(StreamSizeType(theBufferLength)) == theBufferLength); m_outputStream.write(theBuffer, StreamSizeType(theBufferLength)); Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.cpp Sat Jul 12 23:16:42 2008 @@ -140,7 +140,7 @@ bool -XalanToXercesTranscoderWrapper888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4nTranscodeTo(UnicodeCharType theChar) const +XalanToXercesTranscoderWrapper888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4nTranscodeTo(XalanUnicodeChar theChar) const { return m_transcoder->canTranscodeTo(theChar); } Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanToXercesTranscoderWrapper.hpp Sat Jul 12 23:16:42 2008 @@ -73,7 +73,7 @@ unsigned char* theCharSizes); virtual bool - canTranscodeTo(UnicodeCharType theChar) const; + canTranscodeTo(XalanUnicodeChar theChar) const; private: Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp Sat Jul 12 23:16:42 2008 @@ -593,7 +593,7 @@ XalanTranscodingServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnrepresentableCharacterException888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnrepresentableCharacterException( - UnicodeCharType theCharacter, + XalanUnicodeChar theCharacter, const XalanDOMString& theEncoding, XalanDOMString& theBuffer) : XSLException( Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp Sat Jul 12 23:16:42 2008 @@ -60,7 +60,6 @@ typedef unsigned char XalanXMLByte; typedef XalanSize_t size_type; - typedef unsigned int UnicodeCharType; static size_type length(const XalanXMLByte* theBytes) @@ -215,13 +214,6 @@ static bool getBytesEqualChars(const XalanDOMString& theEncoding); - static bool - canTranscodeToLocalCodePage(UnicodeCharType theChar) - { - // Yuck!! See getMaximumCharacterValue() for more details. - return theChar <= 0x7fu ? true : false; - } - static const XalanDOMChar s_utf8String[]; static const XalanDOMChar s_utf16String[]; @@ -289,7 +281,7 @@ public: UnrepresentableCharacterException( - UnicodeCharType theCharacter, + XalanUnicodeChar theCharacter, const XalanDOMString& theEncoding, XalanDOMString& theBuffer); @@ -298,7 +290,7 @@ virtual ~UnrepresentableCharacterException(); - UnicodeCharType + XalanUnicodeChar getCharacter() const { return m_badCharacter; @@ -321,7 +313,7 @@ static const XalanDOMChar s_type[]; - const UnicodeCharType m_badCharacter; + const XalanUnicodeChar m_badCharacter; mutable XalanDOMString m_encoding; }; @@ -342,7 +334,6 @@ typedef XalanTranscodingServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4XalanXMLByte XalanXMLByte; typedef XalanTranscodingServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ode eCode; typedef XalanTranscodingServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type size_type; - typedef XalanTranscodingServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4UnicodeCharType UnicodeCharType; explicit XalanOutputTranscoder(MemoryManager& theManager); @@ -403,7 +394,7 @@ unsigned char* theCharSizes) = 0; virtual bool - canTranscodeTo(UnicodeCharType theChar) const = 0; + canTranscodeTo(XalanUnicodeChar theChar) const = 0; private: Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp Sat Jul 12 23:16:42 2008 @@ -138,7 +138,7 @@ bool -XalanUTF16Transcoder888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4nTranscodeTo(UnicodeCharType /* theChar */) const +XalanUTF16Transcoder888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4nTranscodeTo(XalanUnicodeChar /* theChar */) const { return true; } Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.hpp (original) +++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.hpp Sat Jul 12 23:16:42 2008 @@ -91,7 +91,7 @@ unsigned char* theCharSizes); virtual bool - canTranscodeTo(UnicodeCharType theChar) const; + canTranscodeTo(XalanUnicodeChar theChar) const; private: Modified: xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp (original) +++ xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp Sat Jul 12 23:16:42 2008 @@ -53,6 +53,7 @@ #include <xalanc/XalanDOM/XalanNode.hpp> #include <xalanc/XalanDOM/XalanDocument.hpp> #include <xalanc/XalanDOM/XalanElement.hpp> +#include <xalanc/XalanDOM/XalanNamedNodeMap.hpp> #include <xalanc/XalanDOM/XalanNodeList.hpp> @@ -326,7 +327,19 @@ static_cast<const XalanElement*>(theNode); #endif - theResult = theElement->getAttribute(theAttributeName); + const XalanNamedNodeMap* const theAttributes = + theElement->getAttributes(); + + if (theAttributes != 0) + { + const XalanNode* const theNode = + theAttributes->getNamedItem(theAttributeName); + + if (theNode != 0) + { + theResult = theNode->getNodeValue(); + } + } } return theResult; @@ -577,7 +590,7 @@ const NodeRefListBase& theResultList = theResult->nodeset(); - const unsigned int theLength = theResultList.getLength(); + const NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type theLength = theResultList.getLength(); if (theLength == 0) { @@ -587,7 +600,7 @@ { thePrintWriter.print("<out>"); - for (unsigned int i = 0; i < theLength; i++) + for (NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type i = 0; i < theLength; i++) { thePrintWriter.print(theResultList.item(i)->getNodeName()); thePrintWriter.print(" "); @@ -722,20 +735,17 @@ const NodeRefListBase& theResultList = theResult1->nodeset(); - const unsigned int theLength = theResultList.getLength(); + const NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type theLength = theResultList.getLength(); thePrintWriter.print("theResult1->str() == \""); thePrintWriter.print(theResult1->str()); thePrintWriter.print("\""); thePrintWriter.println(); - if (theLength > 0) + for (NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type i = 0; i < theLength; i++) { - for (unsigned int i = 0; i < theLength; i++) - { - thePrintWriter.print(theResultList.item(i)->getNodeName()); - thePrintWriter.println(); - } + thePrintWriter.print(theResultList.item(i)->getNodeName()); + thePrintWriter.println(); } } catch(...) @@ -755,20 +765,17 @@ const NodeRefListBase& theResultList = theResult2->nodeset(); - const int theLength = theResultList.getLength(); + const NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type theLength = theResultList.getLength(); thePrintWriter.print("theResult2->str() == \""); thePrintWriter.print(theResult2->str()); thePrintWriter.print("\""); thePrintWriter.println(); - if (theLength > 0) + for (NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type i = 0; i < theLength; i++) { - for (int i = 0; i < theLength; i++) - { - thePrintWriter.print(theResultList.item(i)->getNodeName()); - thePrintWriter.println(); - } + thePrintWriter.print(theResultList.item(i)->getNodeName()); + thePrintWriter.println(); } } catch(...) Modified: xalan/c/trunk/src/xalanc/TestXSLT/process.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXSLT/process.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/TestXSLT/process.cpp (original) +++ xalan/c/trunk/src/xalanc/TestXSLT/process.cpp Sat Jul 12 23:16:42 2008 @@ -816,8 +816,8 @@ theXalanSourceTreeDOMSupport.setParserLiaison( &theXalanSourceTreeParserLiaison); - XercesDOMSupport theXercesDOMSupport(theManager); XercesParserLiaison theXercesParserLiaison(theManager); + XercesDOMSupport theXercesDOMSupport(theXercesParserLiaison); DOMSupport& theDOMSupport = getDOMSupport( theXalanSourceTreeDOMSupport, Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp (original) +++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp Sat Jul 12 23:16:42 2008 @@ -75,16 +75,16 @@ // we need to acount for the terminating null, // and the possibility of escaping each character, // 1025 is the maximum buffer size. - const unsigned int theMaxChars = 512; + const XalanSize_t theMaxChars = 512; assert(length <= theMaxChars); XMLCh buffer[(theMaxChars * 2) + 1]; - unsigned int j = 0; + XalanSize_t j = 0; // ICU genrb doesn't like " and {} chars // change tham with \", \{ and \}. - for (unsigned int i = 0 ; i < length ; ++i , ++j) + for (XalanSize_t i = 0 ; i < length ; ++i , ++j) { if (chars[i] == chDoubleQuote || chars[i] == chOpenCurly || Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemData.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemData.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemData.hpp (original) +++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemData.hpp Sat Jul 12 23:16:42 2008 @@ -65,7 +65,7 @@ { "\n", "\n", -"static const unsigned int gXalanMsgArraySize = ", +"static const XalanSize_t gXalanMsgArraySize = ", 0 }; Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp (original) +++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp Sat Jul 12 23:16:42 2008 @@ -59,7 +59,7 @@ { if (sArrayOfStrings != 0) { - for (int i = 0; sArrayOfStrings[i] != 0; ++i) + for (XalanSize_t i = 0; sArrayOfStrings[i] != 0; ++i) { m_stream.writeAsASCII( sArrayOfStrings[i], @@ -89,7 +89,7 @@ { char buffer[20]; - for( unsigned int i = 0; i < length ; ++i) + for (XalanSize_t i = 0; i < length ; ++i) { sprintf( buffer, @@ -143,7 +143,7 @@ { if(!XMLString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ompareString(localname, s_transUnitXMLCh)) { - // this is an elemente, SAX2Handler class is responsible to handle: + // This is an element, SAX2Handler class is responsible to handle: // creating Index file, commom for all localization styles SAX2Handler888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4startElement(uri, localname, qname, attributes); } Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp (original) +++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp Sat Jul 12 23:16:42 2008 @@ -105,7 +105,7 @@ { if (sArrayOfStrings != 0) { - for (unsigned int i = 0; sArrayOfStrings[i] != 0; ++i) + for (XalanSize_t i = 0; sArrayOfStrings[i] != 0; ++i) { m_stream.writeAsASCII( sArrayOfStrings[i], Modified: xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/XalanMsgLib.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/XalanMsgLib.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/XalanMsgLib.cpp (original) +++ xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/XalanMsgLib.cpp Sat Jul 12 23:16:42 2008 @@ -53,8 +53,8 @@ -unsigned int -XalanMsgContainer888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getNumbOfMsgs() +XalanSize_t +XalanMsgContainer888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getMessageCount() { return gXalanMsgArraySize; } @@ -62,12 +62,16 @@ const XalanDOMChar* -XalanMsgContainer888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getMessage(unsigned int msgInd) +XalanMsgContainer888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getMessage(XalanSize_t msgID) { - if ( msgInd < gXalanMsgArraySize ) - return msgArray[msgInd]; + if (msgID < gXalanMsgArraySize) + { + return msgArray[msgID]; + } else + { return s_errString; + } } Modified: xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/XalanMsgLib.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/XalanMsgLib.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/XalanMsgLib.hpp (original) +++ xalan/c/trunk/src/xalanc/Utils/XalanMsgLib/XalanMsgLib.hpp Sat Jul 12 23:16:42 2008 @@ -26,19 +26,19 @@ XALAN_CPP_NAMESPACE_BEGIN + + class XALAN_XALANMSGLIB_EXPORT XalanMsgContainer{ public: - static unsigned int - getNumbOfMsgs(); + static XalanSize_t + getMessageCount(); static const XalanDOMChar* - getMessage(unsigned int); + getMessage(XalanSize_t msgID); private: - - }; @@ -48,4 +48,3 @@ #endif - Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp Sat Jul 12 23:16:42 2008 @@ -199,9 +199,9 @@ } else { - unsigned int i = 0; + size_type i = 0; - while(i < length) + while (i < length) { if (chars[i] > m_maxCharacter) { Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp Sat Jul 12 23:16:42 2008 @@ -813,8 +813,9 @@ } void -FormatterToXML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4throwInvalidCharacterException( unsigned int ch, - MemoryManagerType& theManager) +FormatterToXML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4throwInvalidCharacterException( + XalanUnicodeChar ch, + MemoryManagerType& theManager) { XalanDOMString theMessage(theManager); XalanDOMString theBuffer(theManager); Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp Sat Jul 12 23:16:42 2008 @@ -579,7 +579,7 @@ */ static void throwInvalidCharacterException( - unsigned int ch, + XalanUnicodeChar ch, MemoryManagerType& theManager); static bool Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp Sat Jul 12 23:16:42 2008 @@ -130,18 +130,18 @@ { public: - CommonRepresentableCharFunctor(const XalanOutputStream* stream) : + CommonRepresentableCharFunctor(const XalanOutputStream* stream) : m_stream(stream) { assert(stream != 0); } bool - operator()(unsigned int theChar) const + operator()(XalanUnicodeChar theChar) const { bool result = true; - if( m_stream != 0) + if (m_stream != 0) { result = m_stream->canTranscodeTo(theChar); } @@ -230,7 +230,7 @@ return 0xDC00u <= theChar && theChar <= 0xDFFFu ? true : false; } - static unsigned int + static XalanUnicodeChar decodeUTF16SurrogatePair( XalanDOMChar theHighSurrogate, XalanDOMChar theLowSurrogate, @@ -248,8 +248,8 @@ static void throwInvalidCharacterException( - unsigned int ch, - MemoryManager& theManager) + XalanUnicodeChar ch, + MemoryManager& theManager) { XalanDOMString theMessage(theManager); XalanDOMString theBuffer(theManager); @@ -266,8 +266,8 @@ void throwUnrepresentableCharacterException( - unsigned int ch, - MemoryManager& theManager) + XalanUnicodeChar ch, + MemoryManager& theManager) { XalanDOMString theBuffer(theManager); @@ -340,14 +340,14 @@ * @param theChar A Unicode code point. */ const XalanDOMString& - formatNumericCharacterReference(unsigned int theNumber) + formatNumericCharacterReference(XalanUnicodeChar theChar) { clear(m_stringBuffer); m_stringBuffer.push_back(XalanDOMChar(XalanUnico888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4charAmpersand)); m_stringBuffer.push_back(XalanDOMChar(XalanUnico888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4charNumberSign)); - UnsignedLongToDOMString(theNumber, m_stringBuffer); + UnsignedLongToDOMString(theChar, m_stringBuffer); m_stringBuffer.push_back(XalanDOMChar(XalanUnico888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4charSemicolon)); Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp?rev=676264&r1=676263&r2=676264&view=diff ============================================================================== --- xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp (original) +++ xalan/c/trunk/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp Sat Jul 12 23:16:42 2008 @@ -46,7 +46,7 @@ } void - operator()(unsigned int value) const + operator()(XalanUnicodeChar value) const { m_writer.writeNumericCharacterReference(value); } @@ -66,9 +66,11 @@ } void - operator()(unsigned int value) const + operator()(XalanUnicodeChar value) const { - m_writer.throwUnrepresentableCharacterException(value, m_writer.getMemoryManager()); + m_writer.throwUnrepresentableCharacterException( + value, + m_writer.getMemoryManager()); } private: @@ -131,9 +133,9 @@ const XalanDOMChar theChar = chars[start]; - unsigned int value = theChar; + XalanUnicodeChar value = theChar; - size_type result = start; + size_type result = start; if (isUTF16HighSurrogate(theChar) == true) { @@ -316,9 +318,9 @@ } else { - unsigned int value
{'source': 'Apache Software Foundation Public Mail Archives'}