You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/07/04 02:28:14 UTC
svn commit: r673887 - in /xalan/c/trunk/src/xalanc: PlatformSupport/
XMLSupport/ XPath/ XSLT/ XalanSourceTree/ XercesParserLiaison/
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,
XalanDOMString::size_type(theEnd - theBegin));
+
+ return theResult;
}
@@ -1700,7 +1702,7 @@
template <class ScalarType>
-void
+XalanDOMString&
UnsignedScalarToHexadecimalString(
ScalarType theValue,
XalanDOMString& theResult)
@@ -1720,6 +1722,8 @@
theBegin,
XalanDOMString::size_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(XalanUnicode::charLessThanSign);
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:david_n_bertoni@us.ibm.com">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, Constants::ATTRNAME_OUTPUT_METHOD))
+ if (equals(aname, Constants::ATTRNAME_OUTPUT_METHOD))
{
const XalanDOMChar* const method = atts.getValue(i);
- if(equals(method, Constants::ATTRVAL_OUTPUT_METHOD_HTML))
+ if (equals(method, Constants::ATTRVAL_OUTPUT_METHOD_HTML))
{
m_outputMethod = FormatterListener::OUTPUT_METHOD_HTML;
}
- else if(equals(method, Constants::ATTRVAL_OUTPUT_METHOD_XML))
+ else if (equals(method, Constants::ATTRVAL_OUTPUT_METHOD_XML))
{
m_outputMethod = FormatterListener::OUTPUT_METHOD_XML;
}
- else if(equals(method, Constants::ATTRVAL_OUTPUT_METHOD_TEXT))
+ else if (equals(method, Constants::ATTRVAL_OUTPUT_METHOD_TEXT))
{
m_outputMethod = FormatterListener::OUTPUT_METHOD_TEXT;
}
@@ -510,42 +510,42 @@
theLocator);
}
}
- else if(equals(aname, Constants::ATTRNAME_OUTPUT_VERSION))
+ else if (equals(aname, Constants::ATTRNAME_OUTPUT_VERSION))
{
m_version = atts.getValue(i);
}
- else if(equals(aname,Constants::ATTRNAME_OUTPUT_INDENT))
+ else if (equals(aname,Constants::ATTRNAME_OUTPUT_INDENT))
{
m_indentResult =
getYesOrNo(aname, atts.getValue(i), constructionContext) == true ?
eIndentYesExplicit :
eIndentNoExplicit;
}
- else if(equals(aname,Constants::ATTRNAME_OUTPUT_ENCODING))
+ else if (equals(aname,Constants::ATTRNAME_OUTPUT_ENCODING))
{
m_encoding = atts.getValue(i);
}
- else if(equals(aname,Constants::ATTRNAME_OUTPUT_MEDIATYPE))
+ else if (equals(aname,Constants::ATTRNAME_OUTPUT_MEDIATYPE))
{
m_mediatype = atts.getValue(i);
}
- else if(equals(aname,Constants::ATTRNAME_OUTPUT_DOCTYPE_SYSTEM))
+ else if (equals(aname,Constants::ATTRNAME_OUTPUT_DOCTYPE_SYSTEM))
{
m_doctypeSystem = atts.getValue(i);
}
- else if(equals(aname,Constants::ATTRNAME_OUTPUT_DOCTYPE_PUBLIC))
+ else if (equals(aname,Constants::ATTRNAME_OUTPUT_DOCTYPE_PUBLIC))
{
m_doctypePublic = atts.getValue(i);
}
- else if(equals(aname,Constants::ATTRNAME_OUTPUT_OMITXMLDECL))
+ else if (equals(aname,Constants::ATTRNAME_OUTPUT_OMITXMLDECL))
{
m_omitxmlDecl = getYesOrNo(aname, atts.getValue(i), constructionContext);
}
- else if(equals(aname,Constants::ATTRNAME_OUTPUT_STANDALONE))
+ else if (equals(aname,Constants::ATTRNAME_OUTPUT_STANDALONE))
{
m_standalone = atts.getValue(i);
}
- else if(equals(aname,Constants::ATTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS))
+ else if (equals(aname,Constants::ATTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS))
{
if (m_outputMethod == FormatterListener::OUTPUT_METHOD_NONE ||
m_outputMethod == FormatterListener::OUTPUT_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 == FormatterListener::OUTPUT_METHOD_HTML &&
- m_indentResult == eIndentNoImplicit)
+ if (m_outputMethod == FormatterListener::OUTPUT_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 == XPathEnvSupport::eError)
{
@@ -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 == XPathEnvSupport::eError)
{
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, DOMServices::s_XMLNamespacePrefix) == true)
+ if (equals(theName, DOMServices::s_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, DOMServices::s_XMLNamespacePrefix) == true)
+ if (equals(theName, DOMServices::s_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 XalanDOMString::size_type theColonIndex = indexOf(theQName, XalanUnicode::charColon);
+ const XalanDOMString::size_type theColonIndex =
+ indexOf(theQName, XalanUnicode::charColon);
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 DOMNodeType::NodeType theType = node->getNodeType();
if (theType == DOMNodeType::DOCUMENT_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: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org