You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/07/11 20:49:26 UTC
svn commit: r555366 - in /xerces/c/trunk/src/xercesc: dom/ dom/impl/
framework/ framework/psvi/ internal/ parsers/ sax/ validators/schema/
xinclude/
Author: amassari
Date: Wed Jul 11 11:49:21 2007
New Revision: 555366
URL: http://svn.apache.org/viewvc?view=rev&rev=555366
Log:
Line numbers should use unsigned long (XERCESC-1531)
Modified:
xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp
xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp
xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.cpp
xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp
xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp
xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp
xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp
xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp
xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
xerces/c/trunk/src/xercesc/internal/XMLReader.hpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp
xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp
xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp
xerces/c/trunk/src/xercesc/sax/Locator.hpp
xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp
xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp
xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp
xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp
xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp
xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp
xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
Modified: xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp Wed Jul 11 11:49:21 2007
@@ -808,8 +808,8 @@
*/
virtual DOMElement *createElementNS(const XMLCh *namespaceURI,
const XMLCh *qualifiedName,
- const XMLSSize_t lineNum,
- const XMLSSize_t columnNum) = 0;
+ const unsigned long lineNum,
+ const unsigned long columnNum) = 0;
//@}
};
Modified: xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp Wed Jul 11 11:49:21 2007
@@ -86,7 +86,7 @@
*
* @since DOM Level 3
*/
- virtual XMLSSize_t getLineNumber() const = 0;
+ virtual unsigned long getLineNumber() const = 0;
/**
* Get the column number where the error occured, or -1 if there
@@ -94,7 +94,7 @@
*
* @since DOM Level 3
*/
- virtual XMLSSize_t getColumnNumber() const = 0;
+ virtual unsigned long getColumnNumber() const = 0;
/**
* Get the byte offset into the input source, or -1 if there is no byte offset available.
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp Wed Jul 11 11:49:21 2007
@@ -589,8 +589,8 @@
DOMElement *DOMDocumentImpl::createElementNS(const XMLCh *fNamespaceURI,
const XMLCh *qualifiedName,
- const XMLSSize_t lineNo,
- const XMLSSize_t columnNo)
+ const unsigned long lineNo,
+ const unsigned long columnNo)
{
if(!qualifiedName || !isXMLName(qualifiedName))
throw DOMException(DOMException::INVALID_CHARACTER_ERR,0, getMemoryManager());
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp Wed Jul 11 11:49:21 2007
@@ -198,8 +198,8 @@
const XMLCh *qualifiedName);
virtual DOMElement* createElementNS(const XMLCh *namespaceURI,
const XMLCh *qualifiedName,
- const XMLSSize_t lineNo,
- const XMLSSize_t columnNo);
+ const unsigned long lineNo,
+ const unsigned long columnNo);
virtual DOMAttr* createAttributeNS(const XMLCh *namespaceURI,
const XMLCh *qualifiedName);
virtual DOMNodeList* getElementsByTagNameNS(const XMLCh *namespaceURI,
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.cpp Wed Jul 11 11:49:21 2007
@@ -38,8 +38,8 @@
}
-DOMLocatorImpl::DOMLocatorImpl(const XMLSSize_t lineNum,
- const XMLSSize_t columnNum,
+DOMLocatorImpl::DOMLocatorImpl(const unsigned long lineNum,
+ const unsigned long columnNum,
DOMNode* const errorNode,
const XMLCh* const uri,
const XMLSSize_t byteOffset,
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp Wed Jul 11 11:49:21 2007
@@ -45,8 +45,8 @@
DOMLocatorImpl
(
- const XMLSSize_t lineNum
- , const XMLSSize_t columnNum
+ const unsigned long lineNum
+ , const unsigned long columnNum
, DOMNode* const errorNode
, const XMLCh* const uri
, const XMLSSize_t offset = -1
@@ -59,16 +59,16 @@
//@}
// DOMLocator interface
- virtual XMLSSize_t getLineNumber() const;
- virtual XMLSSize_t getColumnNumber() const;
+ virtual unsigned long getLineNumber() const;
+ virtual unsigned long getColumnNumber() const;
virtual XMLSSize_t getByteOffset() const;
virtual XMLSSize_t getUtf16Offset() const;
virtual DOMNode* getRelatedNode() const;
virtual const XMLCh* getURI() const;
// Setter functions
- void setLineNumber(const XMLSSize_t lineNumber);
- void setColumnNumber(const XMLSSize_t columnNumber);
+ void setLineNumber(const unsigned long lineNumber);
+ void setColumnNumber(const unsigned long columnNumber);
void setByteOffset(const XMLSSize_t offset);
void setUtf16Offset(const XMLSSize_t offset);
void setRelatedNode(DOMNode* const errorNode);
@@ -105,24 +105,24 @@
// fURI
// The uri where the error occured
// -----------------------------------------------------------------------
- XMLSSize_t fLineNum;
- XMLSSize_t fColumnNum;
- XMLSSize_t fByteOffset;
- XMLSSize_t fUtf16Offset;
- DOMNode* fRelatedNode;
- const XMLCh* fURI;
+ unsigned long fLineNum;
+ unsigned long fColumnNum;
+ XMLSSize_t fByteOffset;
+ XMLSSize_t fUtf16Offset;
+ DOMNode* fRelatedNode;
+ const XMLCh* fURI;
};
// ---------------------------------------------------------------------------
// DOMLocatorImpl: Getter methods
// ---------------------------------------------------------------------------
-inline XMLSSize_t DOMLocatorImpl::getLineNumber() const
+inline unsigned long DOMLocatorImpl::getLineNumber() const
{
return fLineNum;
}
-inline XMLSSize_t DOMLocatorImpl::getColumnNumber() const
+inline unsigned long DOMLocatorImpl::getColumnNumber() const
{
return fColumnNum;
}
@@ -151,12 +151,12 @@
// ---------------------------------------------------------------------------
// DOMLocatorImpl: Setter methods
// ---------------------------------------------------------------------------
-inline void DOMLocatorImpl::setLineNumber(const XMLSSize_t lineNumber)
+inline void DOMLocatorImpl::setLineNumber(const unsigned long lineNumber)
{
fLineNum = lineNumber;
}
-inline void DOMLocatorImpl::setColumnNumber(const XMLSSize_t columnNumber)
+inline void DOMLocatorImpl::setColumnNumber(const unsigned long columnNumber)
{
fColumnNum = columnNumber;
}
Modified: xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.cpp Wed Jul 11 11:49:21 2007
@@ -38,8 +38,8 @@
XSDElementNSImpl::XSDElementNSImpl(DOMDocument *ownerDoc,
const XMLCh *namespaceURI,
const XMLCh *qualifiedName,
- const XMLSSize_t lineNo,
- const XMLSSize_t columnNo) :
+ const unsigned long lineNo,
+ const unsigned long columnNo) :
DOMElementNSImpl(ownerDoc, namespaceURI, qualifiedName)
, fLineNo(lineNo)
, fColumnNo(columnNo)
Modified: xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp Wed Jul 11 11:49:21 2007
@@ -41,8 +41,8 @@
class CDOM_EXPORT XSDElementNSImpl: public DOMElementNSImpl {
protected:
- XMLSSize_t fLineNo; //Line number
- XMLSSize_t fColumnNo; //Column number
+ unsigned long fLineNo; //Line number
+ unsigned long fColumnNo; //Column number
public:
@@ -50,14 +50,14 @@
XSDElementNSImpl(DOMDocument *ownerDoc, //DOM Level 2
const XMLCh *namespaceURI,
const XMLCh *qualifiedName,
- const XMLSSize_t lineNo,
- const XMLSSize_t columnNo);
+ const unsigned long lineNo,
+ const unsigned long columnNo);
XSDElementNSImpl(const XSDElementNSImpl &other, bool deep=false);
virtual DOMNode * cloneNode(bool deep) const;
- XMLSSize_t getLineNo() const { return fLineNo; }
- XMLSSize_t getColumnNo() const { return fColumnNo; }
+ unsigned long getLineNo() const { return fLineNo; }
+ unsigned long getColumnNo() const { return fColumnNo; }
private:
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp Wed Jul 11 11:49:21 2007
@@ -121,8 +121,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum
+ , const unsigned long lineNum
+ , const unsigned long colNum
) = 0;
/** Called before a new parse event to allow the handler to reset
Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp Wed Jul 11 11:49:21 2007
@@ -122,14 +122,14 @@
//-----------------------------
/** Getter */
//@{
- inline void getLineCol(int& line, int& col) const;
+ inline void getLineCol(unsigned long& line, unsigned long& col) const;
inline const XMLCh* getSystemId() const;
//@}
//-----------------------------
/** Setter */
//@{
- inline void setLineCol(int line, int col);
+ inline void setLineCol(unsigned long line, unsigned long col);
void setSystemId(const XMLCh* const systemId);
//@}
@@ -158,8 +158,8 @@
private:
XMLCh* fSystemId;
- int fLine;
- int fCol;
+ unsigned long fLine;
+ unsigned long fCol;
};
@@ -173,7 +173,7 @@
return fContents;
}
-inline void XSAnnotation::getLineCol(int& line, int& col) const
+inline void XSAnnotation::getLineCol(unsigned long& line, unsigned long& col) const
{
line = fLine;
col = fCol;
@@ -184,7 +184,7 @@
return fSystemId;
}
-inline void XSAnnotation::setLineCol(int line, int col)
+inline void XSAnnotation::setLineCol(unsigned long line, unsigned long col)
{
fLine = line;
fCol = col;
Modified: xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp Wed Jul 11 11:49:21 2007
@@ -950,7 +950,7 @@
return getLastExtEntity(theEntity)->getSystemId();
}
-XMLSSize_t ReaderMgr::getColumnNumber() const
+unsigned long ReaderMgr::getColumnNumber() const
{
if (!fReaderStack && !fCurReader)
return 0;
@@ -959,7 +959,7 @@
return getLastExtEntity(theEntity)->getColumnNumber();
}
-XMLSSize_t ReaderMgr::getLineNumber() const
+unsigned long ReaderMgr::getLineNumber() const
{
if (!fReaderStack && !fCurReader)
return 0;
Modified: xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp Wed Jul 11 11:49:21 2007
@@ -56,8 +56,8 @@
{
const XMLCh* systemId;
const XMLCh* publicId;
- XMLSSize_t lineNumber;
- XMLSSize_t colNumber;
+ unsigned long lineNumber;
+ unsigned long colNumber;
};
@@ -185,8 +185,8 @@
// -----------------------------------------------------------------------
virtual const XMLCh* getPublicId() const;
virtual const XMLCh* getSystemId() const;
- virtual XMLSSize_t getLineNumber() const;
- virtual XMLSSize_t getColumnNumber() const;
+ virtual unsigned long getLineNumber() const;
+ virtual unsigned long getColumnNumber() const;
private :
Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.cpp Wed Jul 11 11:49:21 2007
@@ -681,7 +681,7 @@
// we have to copy the accepted character(s), and update column
if (fCharIndex != charIndex_start)
{
- fCurCol += fCharIndex - charIndex_start;
+ fCurCol += (unsigned long)(fCharIndex - charIndex_start);
toFill.append(&fCharBuf[charIndex_start], fCharIndex - charIndex_start);
}
@@ -772,7 +772,7 @@
// we have to copy the accepted character(s), and update column
if (fCharIndex != charIndex_start)
{
- fCurCol += fCharIndex - charIndex_start;
+ fCurCol += (unsigned long)(fCharIndex - charIndex_start);
toFill.append(&fCharBuf[charIndex_start], fCharIndex - charIndex_start);
}
@@ -1172,7 +1172,7 @@
}
// Add the source length to the current column to get it back right
- fCurCol += srcLen;
+ fCurCol += (unsigned long)srcLen;
return true;
}
Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.hpp Wed Jul 11 11:49:21 2007
@@ -189,9 +189,9 @@
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
- XMLSSize_t getColumnNumber() const;
+ unsigned long getColumnNumber() const;
const XMLCh* getEncodingStr() const;
- XMLSSize_t getLineNumber() const;
+ unsigned long getLineNumber() const;
bool getNoMoreFlag() const;
const XMLCh* getPublicId() const;
unsigned int getReaderNum() const;
@@ -430,8 +430,8 @@
XMLSize_t fCharsAvail;
unsigned char fCharSizeBuf[kCharBufSize];
unsigned int fCharOfsBuf[kCharBufSize];
- XMLSSize_t fCurCol;
- XMLSSize_t fCurLine;
+ unsigned long fCurCol;
+ unsigned long fCurLine;
XMLRecognizer::Encodings fEncoding;
XMLCh* fEncodingStr;
bool fForcedEncoding;
@@ -528,7 +528,7 @@
// ---------------------------------------------------------------------------
// XMLReader: Getter methods
// ---------------------------------------------------------------------------
-inline XMLSSize_t XMLReader::getColumnNumber() const
+inline unsigned long XMLReader::getColumnNumber() const
{
return fCurCol;
}
@@ -538,7 +538,7 @@
return fEncodingStr;
}
-inline XMLSSize_t XMLReader::getLineNumber() const
+inline unsigned long XMLReader::getLineNumber() const
{
return fCurLine;
}
@@ -635,7 +635,7 @@
if (count != fCharIndex)
{
- fCurCol += (fCharIndex - count);
+ fCurCol += (unsigned long)(fCharIndex - count);
dest.append(&fCharBuf[count], fCharIndex - count);
}
}
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp Wed Jul 11 11:49:21 2007
@@ -769,8 +769,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum)
+ , const unsigned long lineNum
+ , const unsigned long colNum)
{
if (fErrorHandler) {
@@ -781,7 +781,7 @@
else if (errType == XMLErrorReporter::ErrType_Fatal)
severity = DOMError::DOM_SEVERITY_FATAL_ERROR;
- DOMLocatorImpl location((int)lineNum, (int) colNum, getCurrentNode(), systemId);
+ DOMLocatorImpl location(lineNum, colNum, getCurrentNode(), systemId);
if(getScanner()->getCalculateSrcOfs())
location.setByteOffset(getScanner()->getSrcOffset());
DOMErrorImpl domError(severity, errorText, &location);
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp Wed Jul 11 11:49:21 2007
@@ -432,8 +432,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum
+ , const unsigned long lineNum
+ , const unsigned long colNum
);
/** Reset any error data before a new parse
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Wed Jul 11 11:49:21 2007
@@ -1201,8 +1201,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum)
+ , const unsigned long lineNum
+ , const unsigned long colNum)
{
SAXParseException toThrow = SAXParseException
(
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp Wed Jul 11 11:49:21 2007
@@ -1192,8 +1192,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum
+ , const unsigned long lineNum
+ , const unsigned long colNum
);
/**
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp Wed Jul 11 11:49:21 2007
@@ -1159,8 +1159,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum)
+ , const unsigned long lineNum
+ , const unsigned long colNum)
{
SAXParseException toThrow = SAXParseException
(
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp Wed Jul 11 11:49:21 2007
@@ -1601,8 +1601,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum
+ , const unsigned long lineNum
+ , const unsigned long colNum
);
/**
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp Wed Jul 11 11:49:21 2007
@@ -182,8 +182,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum)
+ , const unsigned long lineNum
+ , const unsigned long colNum)
{
SAXParseException toThrow = SAXParseException
(
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp Wed Jul 11 11:49:21 2007
@@ -401,8 +401,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum
+ , const unsigned long lineNum
+ , const unsigned long colNum
);
/** Reset any error data before a new parse
Modified: xerces/c/trunk/src/xercesc/sax/Locator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/sax/Locator.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/sax/Locator.hpp (original)
+++ xerces/c/trunk/src/xercesc/sax/Locator.hpp Wed Jul 11 11:49:21 2007
@@ -99,7 +99,7 @@
* @return The line number, or -1 if none is available.
* @see #getColumnNumber
*/
- virtual XMLSSize_t getLineNumber() const = 0;
+ virtual unsigned long getLineNumber() const = 0;
/**
* Return the column number where the current document event ends.
@@ -109,7 +109,7 @@
* @return The column number, or -1 if none is available.
* @see #getLineNumber
*/
- virtual XMLSSize_t getColumnNumber() const = 0;
+ virtual unsigned long getColumnNumber() const = 0;
//@}
private :
Modified: xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp (original)
+++ xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp Wed Jul 11 11:49:21 2007
@@ -46,8 +46,8 @@
SAXParseException::SAXParseException(const XMLCh* const message
, const XMLCh* const publicId
, const XMLCh* const systemId
- , const XMLSSize_t lineNumber
- , const XMLSSize_t columnNumber
+ , const unsigned long lineNumber
+ , const unsigned long columnNumber
, MemoryManager* const manager) :
SAXException(message, manager)
, fColumnNumber(columnNumber)
@@ -112,13 +112,12 @@
return fSystemId;
}
-XMLSSize_t SAXParseException::getLineNumber() const
+unsigned long SAXParseException::getLineNumber() const
{
return fLineNumber;
}
-
-XMLSSize_t SAXParseException::getColumnNumber() const
+unsigned long SAXParseException::getColumnNumber() const
{
return fColumnNumber;
}
Modified: xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp (original)
+++ xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp Wed Jul 11 11:49:21 2007
@@ -94,8 +94,8 @@
const XMLCh* const message
, const XMLCh* const publicId
, const XMLCh* const systemId
- , const XMLSSize_t lineNumber
- , const XMLSSize_t columnNumber
+ , const unsigned long lineNumber
+ , const unsigned long columnNumber
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -131,19 +131,19 @@
*
* <p>The first column in a line is position 1.</p>
*
- * @return An integer representing the column number, or -1
+ * @return An integer representing the column number, or 0
* if none is available.
* @see Locator#getColumnNumber
*/
- XMLSSize_t getColumnNumber() const;
+ unsigned long getColumnNumber() const;
/**
* The line number of the end of the text where the exception occurred.
*
- * @return An integer representing the line number, or -1
+ * @return An integer representing the line number, or 0
* if none is available.
* @see Locator#getLineNumber
*/
- XMLSSize_t getLineNumber() const;
+ unsigned long getLineNumber() const;
/**
* Get the public identifier of the entity where the exception occurred.
*
@@ -169,9 +169,9 @@
/* Data Members */
/* The column in the source text where the error occured. */
- XMLSSize_t fColumnNumber;
+ unsigned long fColumnNumber;
/* The line in the source text where the error occured. */
- XMLSSize_t fLineNumber;
+ unsigned long fLineNumber;
/* The public id of the file where the error occured. */
XMLCh* fPublicId;
/* The system id of the file where the error occured. */
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp Wed Jul 11 11:49:21 2007
@@ -499,8 +499,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum)
+ , const unsigned long lineNum
+ , const unsigned long colNum)
{
if (errType >= XMLErrorReporter::ErrType_Fatal)
fSawFatal = true;
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp Wed Jul 11 11:49:21 2007
@@ -252,8 +252,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const XMLSSize_t lineNum
- , const XMLSSize_t colNum
+ , const unsigned long lineNum
+ , const unsigned long colNum
);
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp Wed Jul 11 11:49:21 2007
@@ -45,7 +45,7 @@
// ---------------------------------------------------------------------------
void XSDLocator::setValues(const XMLCh* const systemId,
const XMLCh* const publicId,
- const XMLSSize_t lineNo, const XMLSSize_t columnNo)
+ const unsigned long lineNo, const unsigned long columnNo)
{
fLineNo = lineNo;
fColumnNo = columnNo;
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp Wed Jul 11 11:49:21 2007
@@ -77,7 +77,7 @@
* @return The line number, or -1 if none is available.
* @see #getColumnNumber
*/
- virtual XMLSSize_t getLineNumber() const;
+ virtual unsigned long getLineNumber() const;
/**
* Return the column number where the current document event ends.
@@ -87,7 +87,7 @@
* @return The column number, or -1 if none is available.
* @see #getLineNumber
*/
- virtual XMLSSize_t getColumnNumber() const;
+ virtual unsigned long getColumnNumber() const;
//@}
// -----------------------------------------------------------------------
@@ -95,7 +95,7 @@
// -----------------------------------------------------------------------
void setValues(const XMLCh* const systemId,
const XMLCh* const publicId,
- const XMLSSize_t lineNo, const XMLSSize_t columnNo);
+ const unsigned long lineNo, const unsigned long columnNo);
private :
// -----------------------------------------------------------------------
@@ -107,8 +107,8 @@
// -----------------------------------------------------------------------
// Private data members
// -----------------------------------------------------------------------
- XMLSSize_t fLineNo;
- XMLSSize_t fColumnNo;
+ unsigned long fLineNo;
+ unsigned long fColumnNo;
const XMLCh* fSystemId;
const XMLCh* fPublicId;
};
@@ -116,12 +116,12 @@
// ---------------------------------------------------------------------------
// XSDLocator: Getter methods
// ---------------------------------------------------------------------------
-inline XMLSSize_t XSDLocator::getLineNumber() const
+inline unsigned long XSDLocator::getLineNumber() const
{
return fLineNo;
}
-inline XMLSSize_t XSDLocator::getColumnNumber() const
+inline unsigned long XSDLocator::getColumnNumber() const
{
return fColumnNo;
}
Modified: xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp?view=diff&rev=555366&r1=555365&r2=555366
==============================================================================
--- xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp (original)
+++ xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp Wed Jul 11 11:49:21 2007
@@ -718,8 +718,8 @@
const XMLCh* const systemId = href;
const XMLCh* const publicId = href;
/* TODO - look these up somehow? */
- const XMLSSize_t lineNum = -1;
- const XMLSSize_t colNum = -1;
+ const unsigned long lineNum = 0;
+ const unsigned long colNum = 0;
if (fErrorReporter)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org