Author: borisk
Date: Fri Jul 4 00:53:16 2008
New Revision: 673944
URL: http://svn.apache.org/viewvc?rev=673944&view=rev
Log:
Cleanup interfaces in parsers/ to use XMLSize_t.
Modified:
xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp
xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
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
Modified: xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp Fri Jul 4
00:53:16 2008
@@ -295,7 +295,7 @@
return fScanner->getIdentityConstraintChecking();
}
-int AbstractDOMParser::getErrorCount() const
+XMLSize_t AbstractDOMParser::getErrorCount() const
{
return fScanner->getErrorCount();
}
@@ -728,7 +728,7 @@
{
if(fCreateSchemaInfo)
{
- for (unsigned int index=0; index < psviAttributes->getLength();
index++) {
+ for (XMLSize_t index=0; index < psviAttributes->getLength(); index++) {
XERCES_CPP_NAMESPACE_QUALIFIER PSVIAttribute
*attrInfo=psviAttributes->getAttributePSVIAtIndex(index);
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode*
pAttrNode=fCurrentNode->getAttributes()->getNamedItemNS(psviAttributes->getAttributeNamespaceAtIndex(index),
psviAttributes->getAttributeNameAtIndex(index));
@@ -998,7 +998,7 @@
elem = fDocument->createElement(elemDecl.getFullName());
elemImpl = (DOMElementImpl *) elem;
}
- for (unsigned int index = 0; index < attrCount; ++index) {
+ for (XMLSize_t index = 0; index < attrCount; ++index) {
const XMLAttr* oneAttrib = attrList.elementAt(index);
DOMAttrImpl *attr = 0;
DOMNode* remAttr = 0;
@@ -1065,7 +1065,7 @@
DOMAttrImpl * insertAttr = 0;
- for(unsigned int i=0; i<defAttrs->getAttDefCount(); i++)
+ for(XMLSize_t i=0; i<defAttrs->getAttDefCount(); i++)
{
attr = &defAttrs->getAttDef(i);
@@ -1438,7 +1438,7 @@
DOMElement *elem =
fDocument->createElement(elemDecl.getFullName());
DOMElementImpl *elemImpl = (DOMElementImpl *) elem;
- for(unsigned int i=0; i<defAttrs->getAttDefCount(); i++)
+ for(XMLSize_t i=0; i<defAttrs->getAttDefCount(); i++)
{
attr = &defAttrs->getAttDef(i);
if (attr->getValue() != 0)
Modified: xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp Fri Jul 4
00:53:16 2008
@@ -213,7 +213,7 @@
* parse operation.
*
*/
- int getErrorCount() const;
+ XMLSize_t getErrorCount() const;
/** Get the 'do namespaces' flag
*
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp Fri Jul 4 00:53:16
2008
@@ -986,7 +986,7 @@
AbstractDOMParser::docCharacters(chars, length, cdataSection);
if(fFilter)
{
- long whatToShow=fFilter->getWhatToShow();
+ DOMNodeFilter::ShowType whatToShow=fFilter->getWhatToShow();
if(cdataSection && (whatToShow & DOMNodeFilter::SHOW_CDATA_SECTION) ||
!cdataSection && (whatToShow & DOMNodeFilter::SHOW_TEXT))
{
@@ -1010,7 +1010,7 @@
AbstractDOMParser::docComment(comment);
if(fFilter)
{
- long whatToShow=fFilter->getWhatToShow();
+ DOMNodeFilter::ShowType whatToShow=fFilter->getWhatToShow();
if(whatToShow & DOMNodeFilter::SHOW_COMMENT)
{
DOMLSParserFilter::FilterAction action =
@@ -1034,7 +1034,7 @@
AbstractDOMParser::docPI(target, data);
if(fFilter)
{
- long whatToShow=fFilter->getWhatToShow();
+ DOMNodeFilter::ShowType whatToShow=fFilter->getWhatToShow();
if(whatToShow & DOMNodeFilter::SHOW_PROCESSING_INSTRUCTION)
{
DOMLSParserFilter::FilterAction action =
@@ -1062,7 +1062,7 @@
AbstractDOMParser::endElement(elemDecl, urlId, isRoot, elemPrefix);
if(fFilter)
{
- long whatToShow=fFilter->getWhatToShow();
+ DOMNodeFilter::ShowType whatToShow=fFilter->getWhatToShow();
if(whatToShow & DOMNodeFilter::SHOW_ELEMENT)
{
DOMLSParserFilter::FilterAction action =
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Fri Jul 4
00:53:16 2008
@@ -146,9 +146,9 @@
setDoSchema(true);
fPrefixesStorage = new (fMemoryManager) XMLStringPool(109, fMemoryManager)
;
- fPrefixes = new (fMemoryManager) ValueStackOf<unsigned int> (30,
fMemoryManager) ;
+ fPrefixes = new (fMemoryManager) ValueStackOf<XMLSize_t> (30,
fMemoryManager) ;
fTempAttrVec = new (fMemoryManager) RefVectorOf<XMLAttr> (10, false,
fMemoryManager) ;
- fPrefixCounts = new (fMemoryManager) ValueStackOf<unsigned int>(10,
fMemoryManager) ;
+ fPrefixCounts = new (fMemoryManager) ValueStackOf<XMLSize_t>(10,
fMemoryManager) ;
fTempQName = new (fMemoryManager) XMLBuffer(32, fMemoryManager);
}
@@ -176,7 +176,7 @@
if (fAdvDHCount == fAdvDHListSize)
{
// Calc a new size and allocate the new temp buffer
- const unsigned int newSize = (unsigned int)(fAdvDHListSize * 1.5);
+ const XMLSize_t newSize = (XMLSize_t)(fAdvDHListSize * 1.5);
XMLDocumentHandler** newList = (XMLDocumentHandler**)
fMemoryManager->allocate
(
newSize * sizeof(XMLDocumentHandler*)
@@ -218,7 +218,7 @@
// Search the array until we find this handler. If we find a null entry
// first, we can stop there before the list is kept contiguous.
//
- unsigned int index;
+ XMLSize_t index;
for (index = 0; index < fAdvDHCount; index++)
{
//
@@ -538,7 +538,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->docCharacters(chars, length, cdataSection);
}
@@ -557,7 +557,7 @@
// OK, if there are any installed advanced handlers,
// then let's call them with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->docComment(commentText);
}
@@ -571,7 +571,7 @@
// SAX has no way to report this event. But, if there are any installed
// advanced handlers, then lets call them with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->XMLDecl( versionStr,
encodingStr,
standaloneStr,
@@ -590,7 +590,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->docPI(target, data);
}
@@ -604,7 +604,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->endDocument();
}
@@ -619,7 +619,7 @@
// SAX has no way to report this event. But, if there are any installed
// advanced handlers, then lets call them with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->endEntityReference(entityDecl);
}
@@ -640,7 +640,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->ignorableWhitespace(chars, length, cdataSection);
}
@@ -651,7 +651,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->resetDocument();
// Make sure our element depth flag gets set back to zero
@@ -676,7 +676,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->startDocument();
}
@@ -713,12 +713,12 @@
if (getDoNamespaces())
{
- unsigned int numPrefix = 0;
+ XMLSize_t numPrefix = 0;
if (!fNamespacePrefix)
fTempAttrVec->removeAllElements();
- for (unsigned int i = 0; i < attrCount; i++)
+ for (XMLSize_t i = 0; i < attrCount; i++)
{
const XMLCh* nsPrefix = 0;
const XMLCh* nsURI = 0;
@@ -742,7 +742,7 @@
nsPrefix = XMLUni::fgZeroLenString;
if(fDocHandler)
fDocHandler->startPrefixMapping(nsPrefix, nsURI);
- unsigned int
nPrefixId=fPrefixesStorage->addOrFind(nsPrefix);
+ XMLSize_t nPrefixId=fPrefixesStorage->addOrFind(nsPrefix);
fPrefixes->push(nPrefixId) ;
numPrefix++;
}
@@ -794,10 +794,10 @@
);
}
- unsigned int numPrefix = fPrefixCounts->pop();
- for (unsigned int i = 0; i < numPrefix; ++i)
+ XMLSize_t numPrefix = fPrefixCounts->pop();
+ for (XMLSize_t i = 0; i < numPrefix; ++i)
{
- unsigned int nPrefixId = fPrefixes->pop() ;
+ XMLSize_t nPrefixId = fPrefixes->pop() ;
if(fDocHandler)
fDocHandler->endPrefixMapping(
fPrefixesStorage->getValueForId(nPrefixId) );
}
@@ -818,7 +818,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
{
fAdvDHList[index]->startElement
(
@@ -869,10 +869,10 @@
}
// get the prefixes back so that we can call endPrefixMapping()
- unsigned int numPrefix = fPrefixCounts->pop();
- for (unsigned int i = 0; i < numPrefix; i++)
+ XMLSize_t numPrefix = fPrefixCounts->pop();
+ for (XMLSize_t i = 0; i < numPrefix; i++)
{
- unsigned int nPrefixId = fPrefixes->pop() ;
+ XMLSize_t nPrefixId = fPrefixes->pop() ;
if(fDocHandler)
fDocHandler->endPrefixMapping(
fPrefixesStorage->getValueForId(nPrefixId) );
}
@@ -895,7 +895,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->endElement(elemDecl, uriId, isRoot, elemPrefix);
//
@@ -915,7 +915,7 @@
// SAX has no way to report this. But, If there are any installed
// advanced handlers, then lets call them with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->startEntityReference(entityDecl);
}
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp Fri Jul 4
00:53:16 2008
@@ -1644,15 +1644,15 @@
bool fValidation;
bool fParseInProgress;
bool fHasExternalSubset;
- unsigned int fElemDepth;
- unsigned int fAdvDHCount;
- unsigned int fAdvDHListSize;
- VecAttributesImpl fAttrList ;
- ContentHandler* fDocHandler ;
+ XMLSize_t fElemDepth;
+ XMLSize_t fAdvDHCount;
+ XMLSize_t fAdvDHListSize;
+ VecAttributesImpl fAttrList ;
+ ContentHandler* fDocHandler ;
RefVectorOf<XMLAttr>* fTempAttrVec ;
XMLStringPool* fPrefixesStorage ;
- ValueStackOf<unsigned int>* fPrefixes ;
- ValueStackOf<unsigned int>* fPrefixCounts ;
+ ValueStackOf<XMLSize_t>* fPrefixes ;
+ ValueStackOf<XMLSize_t>* fPrefixCounts ;
XMLBuffer* fTempQName;
DTDHandler* fDTDHandler;
EntityResolver* fEntityResolver;
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp Fri Jul 4 00:53:16 2008
@@ -142,7 +142,7 @@
if (fAdvDHCount == fAdvDHListSize)
{
// Calc a new size and allocate the new temp buffer
- const unsigned int newSize = (unsigned int)(fAdvDHListSize * 1.5);
+ const XMLSize_t newSize = (XMLSize_t)(fAdvDHListSize * 1.5);
XMLDocumentHandler** newList = (XMLDocumentHandler**)
fMemoryManager->allocate
(
newSize * sizeof(XMLDocumentHandler*)
@@ -184,7 +184,7 @@
// Search the array until we find this handler. If we find a null entry
// first, we can stop there before the list is kept contiguous.
//
- unsigned int index;
+ XMLSize_t index;
for (index = 0; index < fAdvDHCount; index++)
{
//
@@ -774,7 +774,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->docCharacters(chars, length, cdataSection);
}
@@ -785,7 +785,7 @@
// SAX has no way to report this. But, if there are any installed
// advanced handlers, then lets call them with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->docComment(commentText);
}
@@ -800,7 +800,7 @@
// SAX has no way to report this. But, if there are any installed
// advanced handlers, then lets call them with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->XMLDecl( versionStr,
encodingStr,
standaloneStr,
@@ -819,7 +819,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->docPI(target, data);
}
@@ -833,7 +833,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->endDocument();
}
@@ -867,7 +867,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->endElement(elemDecl, uriId, isRoot, elemPrefix);
//
@@ -885,7 +885,7 @@
// SAX has no way to report this event. But, if there are any installed
// advanced handlers, then lets call them with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->endEntityReference(entityDecl);
}
@@ -906,7 +906,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->ignorableWhitespace(chars, length, cdataSection);
}
@@ -921,7 +921,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->resetDocument();
// Make sure our element depth flag gets set back to zero
@@ -941,7 +941,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->startDocument();
}
@@ -997,7 +997,7 @@
// If there are any installed advanced handlers, then lets call them
// with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
{
fAdvDHList[index]->startElement
(
@@ -1019,7 +1019,7 @@
// SAX has no way to report this. But, If there are any installed
// advanced handlers, then lets call them with this info.
//
- for (unsigned int index = 0; index < fAdvDHCount; index++)
+ for (XMLSize_t index = 0; index < fAdvDHCount; index++)
fAdvDHList[index]->startEntityReference(entityDecl);
}
@@ -1250,7 +1250,7 @@
// SAXParser: Grammar preparsing methods
// ---------------------------------------------------------------------------
Grammar* SAXParser::loadGrammar(const char* const systemId,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache)
{
// Avoid multiple entrance
@@ -1276,7 +1276,7 @@
}
Grammar* SAXParser::loadGrammar(const XMLCh* const systemId,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache)
{
// Avoid multiple entrance
@@ -1302,7 +1302,7 @@
}
Grammar* SAXParser::loadGrammar(const InputSource& source,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache)
{
// Avoid multiple entrance
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp Fri Jul 4 00:53:16 2008
@@ -30,8 +30,10 @@
#include <xercesc/framework/XMLErrorReporter.hpp>
#include <xercesc/framework/XMLBuffer.hpp>
#include <xercesc/util/SecurityManager.hpp>
+#include <xercesc/validators/common/Grammar.hpp>
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
+
XERCES_CPP_NAMESPACE_BEGIN
@@ -40,7 +42,6 @@
class XMLPScanToken;
class XMLScanner;
class XMLValidator;
-class Grammar;
class GrammarResolver;
class XMLGrammarPool;
class XMLEntityResolver;
@@ -1182,7 +1183,7 @@
* @see InputSource#InputSource
*/
Grammar* loadGrammar(const InputSource& source,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache = false);
/**
@@ -1211,7 +1212,7 @@
* @exception DOMException A DOM exception as per DOM spec.
*/
Grammar* loadGrammar(const XMLCh* const systemId,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache = false);
/**
@@ -1239,7 +1240,7 @@
* @exception DOMException A DOM exception as per DOM spec.
*/
Grammar* loadGrammar(const char* const systemId,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache = false);
/**
@@ -2087,9 +2088,9 @@
//
// -----------------------------------------------------------------------
bool fParseInProgress;
- unsigned int fElemDepth;
- unsigned int fAdvDHCount;
- unsigned int fAdvDHListSize;
+ XMLSize_t fElemDepth;
+ XMLSize_t fAdvDHCount;
+ XMLSize_t fAdvDHListSize;
VecAttrListImpl fAttrList;
DocumentHandler* fDocHandler;
DTDHandler* fDTDHandler;
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp Fri Jul 4 00:53:16
2008
@@ -244,7 +244,7 @@
// XercesDOMParser: Grammar preparsing methods
// ---------------------------------------------------------------------------
Grammar* XercesDOMParser::loadGrammar(const char* const systemId,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache)
{
// Avoid multiple entrance
@@ -273,7 +273,7 @@
}
Grammar* XercesDOMParser::loadGrammar(const XMLCh* const systemId,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache)
{
// Avoid multiple entrance
@@ -302,7 +302,7 @@
}
Grammar* XercesDOMParser::loadGrammar(const InputSource& source,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache)
{
// Avoid multiple entrance
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp?rev=673944&r1=673943&r2=673944&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp Fri Jul 4 00:53:16
2008
@@ -24,13 +24,13 @@
#include <xercesc/parsers/AbstractDOMParser.hpp>
+#include <xercesc/validators/common/Grammar.hpp>
XERCES_CPP_NAMESPACE_BEGIN
class EntityResolver;
class ErrorHandler;
-class Grammar;
class XMLEntityResolver;
class XMLResourceIdentifier;
@@ -540,7 +540,7 @@
* @see InputSource#InputSource
*/
Grammar* loadGrammar(const InputSource& source,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache = false);
/**
@@ -569,7 +569,7 @@
* @exception DOMException A DOM exception as per DOM spec.
*/
Grammar* loadGrammar(const XMLCh* const systemId,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache = false);
/**
@@ -597,7 +597,7 @@
* @exception DOMException A DOM exception as per DOM spec.
*/
Grammar* loadGrammar(const char* const systemId,
- const short grammarType,
+ const Grammar::GrammarType grammarType,
const bool toCache = false);
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
