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 2008/07/15 15:27:51 UTC
svn commit: r676911 [2/5] - in /xerces/c/trunk: samples/src/PSVIWriter/
samples/src/SAX2Print/ samples/src/SAXPrint/ samples/src/SCMPrint/
src/xercesc/dom/impl/ src/xercesc/framework/ src/xercesc/internal/
src/xercesc/parsers/ src/xercesc/util/ src/xer...
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner2.cpp Tue Jul 15 06:27:32 2008
@@ -74,9 +74,9 @@
// which have not been normalized. And we get the element declaration from
// which we will get any defaulted or fixed attribute defs and add those
// in as well.
-unsigned int
+XMLSize_t
IGXMLScanner::buildAttList(const RefVectorOf<KVStringPair>& providedAttrs
- , const unsigned int attCount
+ , const XMLSize_t attCount
, XMLElementDecl* elemDecl
, RefVectorOf<XMLAttr>& toFill)
{
@@ -110,11 +110,11 @@
return 0;
// Keep up with how many attrs we end up with total
- unsigned int retCount = 0;
+ XMLSize_t retCount = 0;
// And get the current size of the output vector. This lets us use
// existing elements until we fill it, then start adding new ones.
- const unsigned int curAttListSize = toFill.size();
+ const XMLSize_t curAttListSize = toFill.size();
// We need a buffer into which raw scanned attribute values will be
// normalized.
@@ -132,7 +132,7 @@
// Loop through our explicitly provided attributes, which are in the raw
// scanned form, and build up XMLAttr objects.
- unsigned int index;
+ XMLSize_t index;
for (index = 0; index < attCount; index++)
{
PSVIItem::VALIDITY_STATE attrValid = PSVIItem::VALIDITY_VALID;
@@ -1661,13 +1661,13 @@
);
}
-void IGXMLScanner::scanRawAttrListforNameSpaces(int attCount)
+void IGXMLScanner::scanRawAttrListforNameSpaces(XMLSize_t attCount)
{
// Make an initial pass through the list and find any xmlns attributes or
// schema attributes.
// When we find one, send it off to be used to update the element stack's
// namespace mappings.
- int index = 0;
+ XMLSize_t index = 0;
for (index = 0; index < attCount; index++)
{
// each attribute has the prefix:suffix="value"
@@ -1755,12 +1755,12 @@
ArrayJanitor<XMLCh> janLoc(locStr, fMemoryManager);
processSchemaLocation(locStr);
- unsigned int size = fLocationPairs->size();
+ XMLSize_t size = fLocationPairs->size();
if (size % 2 != 0 ) {
emitError(XMLErrs::BadSchemaLocation);
} else {
- for(unsigned int i=0; i<size; i=i+2) {
+ for(XMLSize_t i=0; i<size; i=i+2) {
resolveSchemaGrammar(fLocationPairs->elementAt(i+1), fLocationPairs->elementAt(i));
}
}
@@ -2162,7 +2162,7 @@
// We have to get the current reader because we have to ignore closing
// quotes until we hit the same reader again.
- const unsigned int curReader = fReaderMgr.getCurrentReaderNum();
+ const XMLSize_t curReader = fReaderMgr.getCurrentReaderNum();
// Loop until we get the attribute value. Note that we use a double
// loop here to avoid the setup/teardown overhead of the exception
@@ -2303,7 +2303,7 @@
// We have to get the current reader because we have to ignore closing
// quotes until we hit the same reader again.
- const unsigned int curReader = fReaderMgr.getCurrentReaderNum();
+ const XMLSize_t curReader = fReaderMgr.getCurrentReaderNum();
// Get attribute def - to check to see if it's declared externally or not
bool isAttExternal = (attDef)
@@ -2961,7 +2961,7 @@
escaped = false;
// We have to insure that its all in one entity
- const unsigned int curReader = fReaderMgr.getCurrentReaderNum();
+ const XMLSize_t curReader = fReaderMgr.getCurrentReaderNum();
// If the next char is a pound, then its a character reference and we
// need to expand it always.
@@ -3226,8 +3226,8 @@
SubstitutionGroupComparator comparator(fGrammarResolver, fURIStringPool);
if (cv) {
- unsigned int i = 0;
- unsigned int leafCount = cv->getLeafCount();
+ XMLSize_t i = 0;
+ XMLSize_t leafCount = cv->getLeafCount();
for (; i < leafCount; i++) {
@@ -3319,10 +3319,10 @@
}
else if (wildCardType == XMLAttDef::Any_List) {
ValueVectorOf<unsigned int>* nameURIList = attWildCard->getNamespaceList();
- unsigned int listSize = (nameURIList) ? nameURIList->size() : 0;
+ XMLSize_t listSize = (nameURIList) ? nameURIList->size() : 0;
if (listSize) {
- for (unsigned int i=0; i < listSize; i++) {
+ for (XMLSize_t i=0; i < listSize; i++) {
if (nameURIList->elementAt(i) == uriId)
anyEncountered = true;
}
Modified: xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp Tue Jul 15 06:27:32 2008
@@ -330,7 +330,7 @@
// entities have been incorrectly left on the stack due to syntax errors.
// It just cleans back the stack, and sends no entity events.
//
-void ReaderMgr::cleanStackBackTo(const unsigned int readerNum)
+void ReaderMgr::cleanStackBackTo(const XMLSize_t readerNum)
{
//
// Just start popping readers until we find the one with the indicated
@@ -780,7 +780,7 @@
}
-unsigned int ReaderMgr::getReaderDepth() const
+XMLSize_t ReaderMgr::getReaderDepth() const
{
// If the stack doesn't exist, its obviously zero
if (!fEntityStack)
@@ -791,7 +791,7 @@
// reader. So if there is no current reader and none on the stack,
// its zero, else its some non-zero value.
//
- unsigned int retVal = fEntityStack->size();
+ XMLSize_t retVal = fEntityStack->size();
if (fCurReader)
retVal++;
return retVal;
@@ -858,9 +858,9 @@
//
if (entity && fEntityStack)
{
- const unsigned int count = fEntityStack->size();
+ const XMLSize_t count = fEntityStack->size();
const XMLCh* const theName = entity->getName();
- for (unsigned int index = 0; index < count; index++)
+ for (XMLSize_t index = 0; index < count; index++)
{
const XMLEntityDecl* curDecl = fEntityStack->elementAt(index);
if (curDecl)
@@ -992,7 +992,7 @@
const XMLEntityDecl* curEntity = fCurEntity;
if (curEntity && !curEntity->isExternal())
{
- unsigned int index = fReaderStack->size();
+ XMLSize_t index = fReaderStack->size();
if (index)
{
while (true)
@@ -1043,7 +1043,7 @@
//
XMLEntityDecl* prevEntity = fCurEntity;
const bool prevReaderThrowAtEnd = fCurReader->getThrowAtEnd();
- const unsigned int readerNum = fCurReader->getReaderNum();
+ const XMLSize_t readerNum = fCurReader->getReaderNum();
//
// Delete the current reader and pop a new reader and entity off
Modified: xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp Tue Jul 15 06:27:32 2008
@@ -103,7 +103,7 @@
// -----------------------------------------------------------------------
// Control methods
// -----------------------------------------------------------------------
- void cleanStackBackTo(const unsigned int readerNum);
+ void cleanStackBackTo(const XMLSize_t readerNum);
XMLReader* createReader
(
const InputSource& src
@@ -165,8 +165,8 @@
XMLEntityDecl* getCurrentEntity();
const XMLReader* getCurrentReader() const;
XMLReader* getCurrentReader();
- unsigned int getCurrentReaderNum() const;
- unsigned int getReaderDepth() const;
+ XMLSize_t getCurrentReaderNum() const;
+ XMLSize_t getReaderDepth() const;
void getLastExtEntityInfo(LastExtEntityInfo& lastInfo) const;
XMLFilePos getSrcOffset() const;
bool getThrowEOE() const;
@@ -267,7 +267,7 @@
// do because some of the compilers we have to support are too stupid to
// understand out of order inlines!
// ---------------------------------------------------------------------------
-inline unsigned int ReaderMgr::getCurrentReaderNum() const
+inline XMLSize_t ReaderMgr::getCurrentReaderNum() const
{
return fCurReader->getReaderNum();
}
Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp Tue Jul 15 06:27:32 2008
@@ -303,7 +303,7 @@
ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Scan_BadPScanToken, fMemoryManager);
// Find the next token and remember the reader id
- unsigned int orgReader;
+ XMLSize_t orgReader;
XMLTokens curToken;
ReaderMgrResetType resetReaderMgr(&fReaderMgr, &ReaderMgr::reset);
@@ -491,7 +491,7 @@
// This method is called from scanStartTag() to handle the very raw initial
// scan of the attributes. It just fills in the passed collection with
// key/value pairs for each attribute. No processing is done on them at all.
-unsigned int
+XMLSize_t
SGXMLScanner::rawAttrScan(const XMLCh* const elemName
, RefVectorOf<KVStringPair>& toFill
, bool& isEmpty)
@@ -499,8 +499,8 @@
// Keep up with how many attributes we've seen so far, and how many
// elements are available in the vector. This way we can reuse old
// elements until we run out and then expand it.
- unsigned int attCount = 0;
- unsigned int curVecSize = toFill.size();
+ XMLSize_t attCount = 0;
+ XMLSize_t curVecSize = toFill.size();
// Assume it is not empty
isEmpty = false;
@@ -740,7 +740,7 @@
// Sense what the next top level token is. According to what
// this tells us, we will call something to handle that kind
// of thing.
- unsigned int orgReader;
+ XMLSize_t orgReader;
const XMLTokens curToken = senseNextToken(orgReader);
// Handle character data and end of file specially. Char data
@@ -917,7 +917,7 @@
DatatypeValidator* psviMemberType = 0;
if (fValidate)
{
- unsigned int failure;
+ XMLSize_t failure;
bool res = fValidator->checkContent
(
topElem->fThisElement
@@ -1105,7 +1105,7 @@
// might be (since we need the element decl in order to do that.)
const XMLCh* qnameRawBuf = fQNameBuf.getRawBuffer();
bool isEmpty;
- unsigned int attCount = rawAttrScan
+ XMLSize_t attCount = rawAttrScan
(
qnameRawBuf
, *fRawAttrList
@@ -1668,7 +1668,7 @@
// If validating, then insure that its legal to have no content
if (fValidate)
{
- unsigned int failure;
+ XMLSize_t failure;
bool res = fValidator->checkContent(elemDecl, 0, 0, &failure);
if (!res)
{
@@ -2104,9 +2104,9 @@
// which have not been normalized. And we get the element declaration from
// which we will get any defaulted or fixed attribute defs and add those
// in as well.
-unsigned int
+XMLSize_t
SGXMLScanner::buildAttList(const RefVectorOf<KVStringPair>& providedAttrs
- , const unsigned int attCount
+ , const XMLSize_t attCount
, XMLElementDecl* elemDecl
, RefVectorOf<XMLAttr>& toFill)
{
@@ -2137,11 +2137,11 @@
return 0;
// Keep up with how many attrs we end up with total
- unsigned int retCount = 0;
+ XMLSize_t retCount = 0;
// And get the current size of the output vector. This lets us use
// existing elements until we fill it, then start adding new ones.
- const unsigned int curAttListSize = toFill.size();
+ const XMLSize_t curAttListSize = toFill.size();
// We need a buffer into which raw scanned attribute values will be
// normalized.
@@ -2150,7 +2150,7 @@
// Loop through our explicitly provided attributes, which are in the raw
// scanned form, and build up XMLAttr objects.
- unsigned int index;
+ XMLSize_t index;
for (index = 0; index < attCount; index++)
{
PSVIItem::VALIDITY_STATE attrValid = PSVIItem::VALIDITY_VALID;
@@ -3522,13 +3522,13 @@
);
}
-void SGXMLScanner::scanRawAttrListforNameSpaces(int attCount)
+void SGXMLScanner::scanRawAttrListforNameSpaces(XMLSize_t attCount)
{
// Make an initial pass through the list and find any xmlns attributes or
// schema attributes.
// When we find one, send it off to be used to update the element stack's
// namespace mappings.
- int index;
+ XMLSize_t index;
for (index = 0; index < attCount; index++)
{
// each attribute has the prefix:suffix="value"
@@ -3618,11 +3618,11 @@
BaseRefVectorOf<XMLCh>* schemaLocation = XMLString::tokenizeString(schemaLocationStr, fMemoryManager);
Janitor<BaseRefVectorOf<XMLCh> > janLoc(schemaLocation);
- unsigned int size = schemaLocation->size();
+ XMLSize_t size = schemaLocation->size();
if (size % 2 != 0 ) {
emitError(XMLErrs::BadSchemaLocation);
} else {
- for(unsigned int i=0; i<size; i=i+2) {
+ for(XMLSize_t i=0; i<size; i=i+2) {
resolveSchemaGrammar(schemaLocation->elementAt(i+1), schemaLocation->elementAt(i));
}
}
@@ -3995,7 +3995,7 @@
// We have to get the current reader because we have to ignore closing
// quotes until we hit the same reader again.
- const unsigned int curReader = fReaderMgr.getCurrentReaderNum();
+ const XMLSize_t curReader = fReaderMgr.getCurrentReaderNum();
// Loop until we get the attribute value. Note that we use a double
// loop here to avoid the setup/teardown overhead of the exception
@@ -4549,7 +4549,7 @@
escaped = false;
// We have to insure that its all in one entity
- const unsigned int curReader = fReaderMgr.getCurrentReaderNum();
+ const XMLSize_t curReader = fReaderMgr.getCurrentReaderNum();
// If the next char is a pound, then its a character reference and we
// need to expand it always.
@@ -4665,8 +4665,8 @@
SubstitutionGroupComparator comparator(fGrammarResolver, fURIStringPool);
if (cv) {
- unsigned int i = 0;
- unsigned int leafCount = cv->getLeafCount();
+ XMLSize_t i = 0;
+ XMLSize_t leafCount = cv->getLeafCount();
for (; i < leafCount; i++) {
@@ -4758,10 +4758,10 @@
}
else if (wildCardType == XMLAttDef::Any_List) {
ValueVectorOf<unsigned int>* nameURIList = attWildCard->getNamespaceList();
- unsigned int listSize = (nameURIList) ? nameURIList->size() : 0;
+ XMLSize_t listSize = (nameURIList) ? nameURIList->size() : 0;
if (listSize) {
- for (unsigned int i=0; i < listSize; i++) {
+ for (XMLSize_t i=0; i < listSize; i++) {
if (nameURIList->elementAt(i) == uriId)
anyEncountered = true;
}
Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.hpp Tue Jul 15 06:27:32 2008
@@ -109,17 +109,17 @@
// -----------------------------------------------------------------------
// Helper methods
// -----------------------------------------------------------------------
- unsigned int buildAttList
+ XMLSize_t buildAttList
(
const RefVectorOf<KVStringPair>& providedAttrs
- , const unsigned int attCount
+ , const XMLSize_t attCount
, XMLElementDecl* elemDecl
, RefVectorOf<XMLAttr>& toFill
);
bool laxElementValidation(QName* element, ContentLeafNameTypeVector* cv,
const XMLContentModel* const cm,
const unsigned int parentElemDepth);
- unsigned int rawAttrScan
+ XMLSize_t rawAttrScan
(
const XMLCh* const elemName
, RefVectorOf<KVStringPair>& toFill
@@ -258,7 +258,7 @@
, XMLBuffer& uriBufToFill
, const ElemStack::MapModes mode
);
- void scanRawAttrListforNameSpaces(int attCount);
+ void scanRawAttrListforNameSpaces(XMLSize_t attCount);
void parseSchemaLocation(const XMLCh* const schemaLocationStr);
void resolveSchemaGrammar(const XMLCh* const loc, const XMLCh* const uri);
bool switchGrammar(const XMLCh* const newGrammarNameSpace);
Modified: xerces/c/trunk/src/xercesc/internal/WFXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/WFXMLScanner.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/WFXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/WFXMLScanner.cpp Tue Jul 15 06:27:32 2008
@@ -246,7 +246,7 @@
ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Scan_BadPScanToken, fMemoryManager);
// Find the next token and remember the reader id
- unsigned int orgReader;
+ XMLSize_t orgReader;
XMLTokens curToken;
bool retVal = true;
@@ -422,7 +422,7 @@
void WFXMLScanner::commonInit()
{
fEntityTable = new (fMemoryManager) ValueHashTableOf<XMLCh>(11, fMemoryManager);
- fAttrNameHashList = new (fMemoryManager)ValueVectorOf<unsigned int>(16, fMemoryManager);
+ fAttrNameHashList = new (fMemoryManager)ValueVectorOf<XMLSize_t>(16, fMemoryManager);
fAttrNSList = new (fMemoryManager) ValueVectorOf<XMLAttr*>(8, fMemoryManager);
fElements = new (fMemoryManager) RefVectorOf<XMLElementDecl>(32, true, fMemoryManager);
fElementLookup = new (fMemoryManager) RefHashTableOf<XMLElementDecl>(109, false, fMemoryManager);
@@ -590,7 +590,7 @@
// Sense what the next top level token is. According to what
// this tells us, we will call something to handle that kind
// of thing.
- unsigned int orgReader;
+ XMLSize_t orgReader;
const XMLTokens curToken = senseNextToken(orgReader);
// Handle character data and end of file specially. Char data
@@ -824,8 +824,8 @@
// We loop until we either see a /> or >, handling attribute/value
// pairs until we get there.
- unsigned int attCount = 0;
- unsigned int curAttListSize = fAttrList->size();
+ XMLSize_t attCount = 0;
+ XMLSize_t curAttListSize = fAttrList->size();
while (true)
{
// And get the next non-space character
@@ -909,11 +909,11 @@
// See if this attribute is declared more than one for this element.
const XMLCh* attNameRawBuf = fAttNameBuf.getRawBuffer();
- unsigned int attNameHash = XMLString::hash(attNameRawBuf, 109, fMemoryManager);
+ XMLSize_t attNameHash = XMLString::hash(attNameRawBuf, 109, fMemoryManager);
if (attCount) {
- for (unsigned int k=0; k < attCount; k++) {
+ for (XMLSize_t k=0; k < attCount; k++) {
if (fAttrNameHashList->elementAt(k) == attNameHash) {
if (
@@ -1155,8 +1155,8 @@
// We loop until we either see a /> or >, handling attribute/value
// pairs until we get there.
- unsigned int attCount = 0;
- unsigned int curAttListSize = fAttrList->size();
+ XMLSize_t attCount = 0;
+ XMLSize_t curAttListSize = fAttrList->size();
while (true)
{
// And get the next non-space character
@@ -1244,10 +1244,10 @@
// See if this attribute is declared more than one for this element.
const XMLCh* attNameRawBuf = fAttNameBuf.getRawBuffer();
- unsigned int attNameHash = XMLString::hash(attNameRawBuf, 109, fMemoryManager);
+ XMLSize_t attNameHash = XMLString::hash(attNameRawBuf, 109, fMemoryManager);
if (attCount) {
- for (unsigned int k=0; k < attCount; k++) {
+ for (XMLSize_t k=0; k < attCount; k++) {
if (fAttrNameHashList->elementAt(k) == attNameHash) {
if (XMLString::equals(
@@ -1610,7 +1610,7 @@
// We have to get the current reader because we have to ignore closing
// quotes until we hit the same reader again.
- const unsigned int curReader = fReaderMgr.getCurrentReaderNum();
+ const XMLSize_t curReader = fReaderMgr.getCurrentReaderNum();
// Loop until we get the attribute value. Note that we use a double
// loop here to avoid the setup/teardown overhead of the exception
@@ -2062,7 +2062,7 @@
escaped = false;
// We have to insure that its all in one entity
- const unsigned int curReader = fReaderMgr.getCurrentReaderNum();
+ const XMLSize_t curReader = fReaderMgr.getCurrentReaderNum();
// If the next char is a pound, then its a character reference and we
// need to expand it always.
Modified: xerces/c/trunk/src/xercesc/internal/WFXMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/WFXMLScanner.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/WFXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/WFXMLScanner.hpp Tue Jul 15 06:27:32 2008
@@ -149,7 +149,7 @@
unsigned int fElementIndex;
RefVectorOf<XMLElementDecl>* fElements;
ValueHashTableOf<XMLCh>* fEntityTable;
- ValueVectorOf<unsigned int>* fAttrNameHashList;
+ ValueVectorOf<XMLSize_t>* fAttrNameHashList;
ValueVectorOf<XMLAttr*>* fAttrNSList;
RefHashTableOf<XMLElementDecl>* fElementLookup;
};
Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.hpp Tue Jul 15 06:27:32 2008
@@ -194,7 +194,7 @@
XMLFileLoc getLineNumber() const;
bool getNoMoreFlag() const;
const XMLCh* getPublicId() const;
- unsigned int getReaderNum() const;
+ XMLSize_t getReaderNum() const;
RefFrom getRefFrom() const;
Sources getSource() const;
XMLFilePos getSrcOffset() const;
@@ -210,7 +210,7 @@
(
const XMLCh* const newEncoding
);
- void setReaderNum(const unsigned int newNum);
+ void setReaderNum(const XMLSize_t newNum);
void setThrowAtEnd(const bool newValue);
void setXMLVersion(const XMLVersion version);
@@ -440,7 +440,7 @@
XMLSize_t fRawBufIndex;
XMLByte fRawByteBuf[kRawBufSize];
XMLSize_t fRawBytesAvail;
- unsigned int fReaderNum;
+ XMLSize_t fReaderNum;
RefFrom fRefFrom;
bool fSentTrailingSpace;
Sources fSource;
@@ -553,7 +553,7 @@
return fPublicId;
}
-inline unsigned int XMLReader::getReaderNum() const
+inline XMLSize_t XMLReader::getReaderNum() const
{
return fReaderNum;
}
@@ -586,7 +586,7 @@
// ---------------------------------------------------------------------------
// XMLReader: Setter methods
// ---------------------------------------------------------------------------
-inline void XMLReader::setReaderNum(const unsigned int newNum)
+inline void XMLReader::setReaderNum(const XMLSize_t newNum)
{
fReaderNum = newNum;
}
Modified: xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLScanner.cpp Tue Jul 15 06:27:32 2008
@@ -1861,7 +1861,7 @@
// in the input stream. It will return an enumerated value that indicates
// what it believes the next XML level token must be. It will eat as many
// chars are required to figure out what is next.
-XMLScanner::XMLTokens XMLScanner::senseNextToken(unsigned int& orgReader)
+XMLScanner::XMLTokens XMLScanner::senseNextToken(XMLSize_t& orgReader)
{
// Get the next character and use it to guesstimate what the next token
// is going to be. We turn on end of entity exceptions when we do this
Modified: xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp Tue Jul 15 06:27:32 2008
@@ -484,7 +484,7 @@
void checkInternalDTD(bool hasExtSubset, const XMLCh* const sysId, const XMLCh* const pubId);
void checkIDRefs();
bool isLegalToken(const XMLPScanToken& toCheck);
- XMLTokens senseNextToken(unsigned int& orgReader);
+ XMLTokens senseNextToken(XMLSize_t& orgReader);
void initValidator(XMLValidator* theValidator);
inline void resetValidationContext();
unsigned int *getNewUIntPtr();
@@ -494,7 +494,7 @@
inline
void setAttrDupChkRegistry
(
- const unsigned int &attrNumber
+ const XMLSize_t &attrNumber
, bool &toUseHashTable
);
@@ -1355,7 +1355,7 @@
fEntityDeclPoolRetrieved = false;
}
-inline void XMLScanner::setAttrDupChkRegistry(const unsigned int &attrNumber
+inline void XMLScanner::setAttrDupChkRegistry(const XMLSize_t &attrNumber
, bool &toUseHashTable)
{
// once the attribute exceed 100, we use hash table to check duplication
Modified: xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp Tue Jul 15 06:27:32 2008
@@ -112,7 +112,7 @@
// this element and let him validate it.
if (fValidate)
{
- unsigned int failure;
+ XMLSize_t failure;
bool res = fValidator->checkContent
(
topElem->fThisElement
@@ -224,7 +224,7 @@
// might be (since we need the element decl in order to do that.)
const XMLCh* qnameRawBuf = fQNameBuf.getRawBuffer();
bool isEmpty;
- unsigned int attCount = rawAttrScan(qnameRawBuf, *fRawAttrList, isEmpty);
+ XMLSize_t attCount = rawAttrScan(qnameRawBuf, *fRawAttrList, isEmpty);
// save the contentleafname and currentscope before addlevel, for later use
ContentLeafNameTypeVector* cv = 0;
@@ -458,7 +458,7 @@
// If validating, then insure that its legal to have no content
if (fValidate)
{
- unsigned int failure;
+ XMLSize_t failure;
bool res = fValidator->checkContent(elemDecl, 0, 0, &failure);
if (!res)
{
@@ -607,13 +607,13 @@
}
-void XSAXMLScanner::scanRawAttrListforNameSpaces(int attCount)
+void XSAXMLScanner::scanRawAttrListforNameSpaces(XMLSize_t attCount)
{
// Make an initial pass through the list and find any xmlns attributes or
// schema attributes.
// When we find one, send it off to be used to update the element stack's
// namespace mappings.
- int index = 0;
+ XMLSize_t index = 0;
for (index = 0; index < attCount; index++)
{
// each attribute has the prefix:suffix="value"
Modified: xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.hpp Tue Jul 15 06:27:32 2008
@@ -84,7 +84,7 @@
// -----------------------------------------------------------------------
// Private helper methods
// -----------------------------------------------------------------------
- void scanRawAttrListforNameSpaces(int attCount);
+ void scanRawAttrListforNameSpaces(XMLSize_t attCount);
void switchGrammar(const XMLCh* const newGrammarNameSpace, bool laxValidate);
};
Modified: xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSObjectFactory.cpp Tue Jul 15 06:27:32 2008
@@ -320,11 +320,11 @@
{
typeVariety = XSSimpleTypeDefinition::VARIETY_UNION;
RefVectorOf<DatatypeValidator>* membersDV = ((UnionDatatypeValidator*)validator)->getMemberTypeValidators();
- unsigned int size = membersDV->size();
+ XMLSize_t size = membersDV->size();
if (size)
{
memberTypes = new (fMemoryManager) RefVectorOf<XSSimpleTypeDefinition>(size, false, fMemoryManager);
- for (unsigned int i=0; i<size; i++)
+ for (XMLSize_t i=0; i<size; i++)
memberTypes->addElement(addOrFind(membersDV->elementAt(i), xsModel));
}
@@ -430,7 +430,7 @@
if (!elemDecl->getComplexTypeInfo() && elemDecl->getDatatypeValidator())
xsType = addOrFind(elemDecl->getDatatypeValidator(), xsModel);
- unsigned int count = elemDecl->getIdentityConstraintCount();
+ XMLSize_t count = elemDecl->getIdentityConstraintCount();
if (count)
{
//REVISIT: size of hash table....
@@ -443,7 +443,7 @@
, fMemoryManager
);
- for (unsigned int i = 0; i < count; i++)
+ for (XMLSize_t i = 0; i < count; i++)
{
XSIDCDefinition* icDef = addOrFind
(
@@ -521,7 +521,7 @@
(typeInfo->getDatatypeValidator()))
xsSimpleType = addOrFind(typeInfo->getDatatypeValidator(), xsModel);
- unsigned int attCount=0;
+ XMLSize_t attCount=0;
if (typeInfo->hasAttDefs())
{
SchemaAttDefList& attDefList = (SchemaAttDefList&) typeInfo->getAttDefList();
@@ -592,8 +592,8 @@
}
// process local elements
- unsigned int elemCount = typeInfo->elementCount();
- for (unsigned int j=0; j<elemCount; j++)
+ XMLSize_t elemCount = typeInfo->elementCount();
+ for (XMLSize_t j=0; j<elemCount; j++)
{
SchemaElementDecl* elemDecl = typeInfo->elementAt(j);
@@ -614,14 +614,14 @@
{
XSIDCDefinition* keyIC = 0;
StringList* stringList = 0;
- unsigned int fieldCount = ic->getFieldCount();
+ XMLSize_t fieldCount = ic->getFieldCount();
if (fieldCount)
{
stringList = new (fMemoryManager) RefArrayVectorOf<XMLCh>(
fieldCount, true, fMemoryManager);
- for(unsigned int i=0; i<fieldCount; i++)
+ for(XMLSize_t i=0; i<fieldCount; i++)
{
XMLCh* expr = XMLString::replicate
(
@@ -733,8 +733,8 @@
fDeleteVector->addElement(xsObj);
// process local elements
- unsigned int elemCount = groupInfo->elementCount();
- for (unsigned int j=0; j<elemCount; j++)
+ XMLSize_t elemCount = groupInfo->elementCount();
+ for (XMLSize_t j=0; j<elemCount; j++)
{
SchemaElementDecl* elemDecl = groupInfo->elementAt(j);
@@ -752,12 +752,12 @@
{
XSAttributeUseList* xsAttList = 0;
XSWildcard* xsWildcard = 0;
- unsigned int attCount = attGroupInfo->attributeCount();
+ XMLSize_t attCount = attGroupInfo->attributeCount();
if (attCount)
{
xsAttList = new (fMemoryManager) RefVectorOf<XSAttributeUse>(attCount, false, fMemoryManager);
- for (unsigned int i=0; i < attCount; i++)
+ for (XMLSize_t i=0; i < attCount; i++)
{
SchemaAttDef* attDef = attGroupInfo->attributeAt(i);
XSAttributeDeclaration* xsAttDecl = 0;
Modified: xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XTemplateSerializer.cpp Tue Jul 15 06:27:32 2008
@@ -263,10 +263,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorSize = objToStore->size();
+ XMLSize_t vectorSize = objToStore->size();
serEng<<vectorSize;
- for ( unsigned int i = 0; i < vectorSize; i++)
+ for ( XMLSize_t i = 0; i < vectorSize; i++)
{
SchemaElementDecl*& data = objToStore->elementAt(i);
serEng<<data;
@@ -315,10 +315,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorSize = objToStore->size();
+ XMLSize_t vectorSize = objToStore->size();
serEng<<vectorSize;
- for ( unsigned int i = 0; i < vectorSize; i++)
+ for ( XMLSize_t i = 0; i < vectorSize; i++)
{
unsigned int& data = objToStore->elementAt(i);
serEng<<data;
@@ -376,10 +376,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorSize = objToStore->size();
+ XMLSize_t vectorSize = objToStore->size();
serEng<<vectorSize;
- for ( unsigned int i = 0; i < vectorSize; i++)
+ for ( XMLSize_t i = 0; i < vectorSize; i++)
{
serEng.writeString(objToStore->elementAt(i));
}
@@ -446,10 +446,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
SchemaAttDef* data = objToStore->elementAt(i);
serEng<<data;
@@ -503,10 +503,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
SchemaElementDecl* data = objToStore->elementAt(i);
serEng<<data;
@@ -557,10 +557,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
ContentSpecNode* data = objToStore->elementAt(i);
serEng<<data;
@@ -610,10 +610,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
IC_Field* data = objToStore->elementAt(i);
serEng<<data;
@@ -663,10 +663,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
DatatypeValidator* data = objToStore->elementAt(i);
DatatypeValidator::storeDV(serEng, data);
@@ -716,10 +716,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
IdentityConstraint* data = objToStore->elementAt(i);
IdentityConstraint::storeIC(serEng, data);
@@ -769,10 +769,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
XMLNumber* data = objToStore->elementAt(i);
serEng<<data;
@@ -823,10 +823,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
XercesLocationPath* data = objToStore->elementAt(i);
serEng<<data;
@@ -876,10 +876,10 @@
if (serEng.needToStoreObject(objToStore))
{
- unsigned int vectorLength = objToStore->size();
+ XMLSize_t vectorLength = objToStore->size();
serEng<<vectorLength;
- for ( unsigned int i = 0; i < vectorLength; i++)
+ for ( XMLSize_t i = 0; i < vectorLength; i++)
{
XercesStep* data = objToStore->elementAt(i);
serEng<<data;
@@ -948,7 +948,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<KVStringPair> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1026,7 +1026,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<XMLAttDef> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1111,7 +1111,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<DTDAttDef> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1191,7 +1191,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<ComplexTypeInfo> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1271,7 +1271,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<XercesGroupInfo> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1377,7 +1377,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<XercesAttGroupInfo> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1458,7 +1458,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<XMLRefInfo> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1546,7 +1546,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<DatatypeValidator> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1660,7 +1660,7 @@
serEng<<objToStore->getHashModulus();
RefHashTableOfEnumerator<Grammar> e(objToStore, false, objToStore->getMemoryManager());
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
while (e.hasMoreElements())
{
@@ -1806,10 +1806,10 @@
}
}
- unsigned int itemNumber = ids.size();
+ XMLSize_t itemNumber = ids.size();
serEng<<itemNumber;
- for (unsigned int i=0; i<itemNumber; i++)
+ for (XMLSize_t i=0; i<itemNumber; i++)
{
XSerializeEngine::XSerializedObjectId_t keyId = ids.elementAt(i);
XSAnnotation* data = objToStore->get(keys.elementAt(i));
@@ -1889,7 +1889,7 @@
serEng<<objToStore->getHashModulus();
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
RefHash2KeysTableOfEnumerator<SchemaAttDef> e(objToStore, false, objToStore->getMemoryManager());
@@ -1984,7 +1984,7 @@
serEng<<objToStore->getHashModulus();
- unsigned int itemNumber = 0;
+ XMLSize_t itemNumber = 0;
RefHash2KeysTableOfEnumerator<ElemVector> e(objToStore, false, objToStore->getMemoryManager());
@@ -2082,8 +2082,8 @@
// bool FOUND=false;
- unsigned int vectorSize = data->size();
- for ( unsigned int i = 0; i < vectorSize; i++)
+ XMLSize_t vectorSize = data->size();
+ for ( XMLSize_t i = 0; i < vectorSize; i++)
{
SchemaElementDecl*& elem = data->elementAt(i);
SchemaElementDecl* subElem = elem->getSubstitutionGroupElem();
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Tue Jul 15 06:27:32 2008
@@ -146,7 +146,7 @@
setDoSchema(true);
fPrefixesStorage = new (fMemoryManager) XMLStringPool(109, fMemoryManager) ;
- fPrefixes = new (fMemoryManager) ValueStackOf<XMLSize_t> (30, fMemoryManager) ;
+ fPrefixes = new (fMemoryManager) ValueStackOf<unsigned int> (30, fMemoryManager) ;
fTempAttrVec = new (fMemoryManager) RefVectorOf<XMLAttr> (10, false, fMemoryManager) ;
fPrefixCounts = new (fMemoryManager) ValueStackOf<XMLSize_t>(10, fMemoryManager) ;
fTempQName = new (fMemoryManager) XMLBuffer(32, fMemoryManager);
@@ -742,7 +742,7 @@
nsPrefix = XMLUni::fgZeroLenString;
if(fDocHandler)
fDocHandler->startPrefixMapping(nsPrefix, nsURI);
- XMLSize_t nPrefixId=fPrefixesStorage->addOrFind(nsPrefix);
+ unsigned int nPrefixId=fPrefixesStorage->addOrFind(nsPrefix);
fPrefixes->push(nPrefixId) ;
numPrefix++;
}
@@ -797,7 +797,7 @@
XMLSize_t numPrefix = fPrefixCounts->pop();
for (XMLSize_t i = 0; i < numPrefix; ++i)
{
- XMLSize_t nPrefixId = fPrefixes->pop() ;
+ unsigned int nPrefixId = fPrefixes->pop() ;
if(fDocHandler)
fDocHandler->endPrefixMapping( fPrefixesStorage->getValueForId(nPrefixId) );
}
@@ -872,7 +872,7 @@
XMLSize_t numPrefix = fPrefixCounts->pop();
for (XMLSize_t i = 0; i < numPrefix; i++)
{
- XMLSize_t nPrefixId = fPrefixes->pop() ;
+ unsigned int nPrefixId = fPrefixes->pop() ;
if(fDocHandler)
fDocHandler->endPrefixMapping( fPrefixesStorage->getValueForId(nPrefixId) );
}
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp Tue Jul 15 06:27:32 2008
@@ -1651,7 +1651,7 @@
ContentHandler* fDocHandler ;
RefVectorOf<XMLAttr>* fTempAttrVec ;
XMLStringPool* fPrefixesStorage ;
- ValueStackOf<XMLSize_t>* fPrefixes ;
+ ValueStackOf<unsigned int>* fPrefixes ;
ValueStackOf<XMLSize_t>* fPrefixCounts ;
XMLBuffer* fTempQName;
DTDHandler* fDTDHandler;
Modified: xerces/c/trunk/src/xercesc/util/BaseRefVectorOf.c
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BaseRefVectorOf.c?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BaseRefVectorOf.c (original)
+++ xerces/c/trunk/src/xercesc/util/BaseRefVectorOf.c Tue Jul 15 06:27:32 2008
@@ -27,7 +27,7 @@
// BaseRefVectorOf: Constructors and Destructor
// ---------------------------------------------------------------------------
template <class TElem>
-BaseRefVectorOf<TElem>::BaseRefVectorOf( const unsigned int maxElems
+BaseRefVectorOf<TElem>::BaseRefVectorOf( const XMLSize_t maxElems
, const bool adoptElems
, MemoryManager* const manager) :
@@ -39,7 +39,7 @@
{
// Allocate and initialize the array
fElemList = (TElem**) fMemoryManager->allocate(maxElems * sizeof(TElem*));//new TElem*[maxElems];
- for (unsigned int index = 0; index < maxElems; index++)
+ for (XMLSize_t index = 0; index < maxElems; index++)
fElemList[index] = 0;
}
@@ -62,7 +62,7 @@
template <class TElem> void
-BaseRefVectorOf<TElem>::setElementAt(TElem* const toSet, const unsigned int setAt)
+BaseRefVectorOf<TElem>::setElementAt(TElem* const toSet, const XMLSize_t setAt)
{
if (setAt >= fCurCount)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex, fMemoryManager);
@@ -73,7 +73,7 @@
}
template <class TElem> void BaseRefVectorOf<TElem>::
-insertElementAt(TElem* const toInsert, const unsigned int insertAt)
+insertElementAt(TElem* const toInsert, const XMLSize_t insertAt)
{
if (insertAt == fCurCount)
{
@@ -87,7 +87,7 @@
ensureExtraCapacity(1);
// Make room for the newbie
- for (unsigned int index = fCurCount; index > insertAt; index--)
+ for (XMLSize_t index = fCurCount; index > insertAt; index--)
fElemList[index] = fElemList[index-1];
// And stick it in and bump the count
@@ -96,7 +96,7 @@
}
template <class TElem> TElem* BaseRefVectorOf<TElem>::
-orphanElementAt(const unsigned int orphanAt)
+orphanElementAt(const XMLSize_t orphanAt)
{
if (orphanAt >= fCurCount)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex, fMemoryManager);
@@ -113,7 +113,7 @@
}
// Copy down every element above orphan point
- for (unsigned int index = orphanAt; index < fCurCount-1; index++)
+ for (XMLSize_t index = orphanAt; index < fCurCount-1; index++)
fElemList[index] = fElemList[index+1];
// Keep unused elements zero for sanity's sake
@@ -127,7 +127,7 @@
template <class TElem> void BaseRefVectorOf<TElem>::removeAllElements()
{
- for (unsigned int index = 0; index < fCurCount; index++)
+ for (XMLSize_t index = 0; index < fCurCount; index++)
{
if (fAdoptedElems)
delete fElemList[index];
@@ -139,7 +139,7 @@
}
template <class TElem> void BaseRefVectorOf<TElem>::
-removeElementAt(const unsigned int removeAt)
+removeElementAt(const XMLSize_t removeAt)
{
if (removeAt >= fCurCount)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex, fMemoryManager);
@@ -156,7 +156,7 @@
}
// Copy down every element above remove point
- for (unsigned int index = removeAt; index < fCurCount-1; index++)
+ for (XMLSize_t index = removeAt; index < fCurCount-1; index++)
fElemList[index] = fElemList[index+1];
// Keep unused elements zero for sanity's sake
@@ -179,7 +179,7 @@
template <class TElem>
bool BaseRefVectorOf<TElem>::containsElement(const TElem* const toCheck) {
- for (unsigned int i = 0; i < fCurCount; i++) {
+ for (XMLSize_t i = 0; i < fCurCount; i++) {
if (fElemList[i] == toCheck) {
return true;
}
@@ -197,7 +197,7 @@
{
if (fAdoptedElems)
{
- for (unsigned int index = 0; index < fCurCount; index++)
+ for (XMLSize_t index = 0; index < fCurCount; index++)
delete fElemList[index];
}
fMemoryManager->deallocate(fElemList);//delete [] fElemList;
@@ -215,7 +215,7 @@
cleanup();
fElemList = (TElem**) fMemoryManager->allocate(fMaxCount * sizeof(TElem*));//new TElem*[fMaxCount];
- for (unsigned int index = 0; index < fMaxCount; index++)
+ for (XMLSize_t index = 0; index < fMaxCount; index++)
fElemList[index] = 0;
}
@@ -230,13 +230,13 @@
// ---------------------------------------------------------------------------
// BaseRefVectorOf: Getter methods
// ---------------------------------------------------------------------------
-template <class TElem> unsigned int BaseRefVectorOf<TElem>::curCapacity() const
+template <class TElem> XMLSize_t BaseRefVectorOf<TElem>::curCapacity() const
{
return fMaxCount;
}
template <class TElem> const TElem* BaseRefVectorOf<TElem>::
-elementAt(const unsigned int getAt) const
+elementAt(const XMLSize_t getAt) const
{
if (getAt >= fCurCount)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex, fMemoryManager);
@@ -244,14 +244,14 @@
}
template <class TElem> TElem*
-BaseRefVectorOf<TElem>::elementAt(const unsigned int getAt)
+BaseRefVectorOf<TElem>::elementAt(const XMLSize_t getAt)
{
if (getAt >= fCurCount)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex, fMemoryManager);
return fElemList[getAt];
}
-template <class TElem> unsigned int BaseRefVectorOf<TElem>::size() const
+template <class TElem> XMLSize_t BaseRefVectorOf<TElem>::size() const
{
return fCurCount;
}
@@ -261,9 +261,9 @@
// BaseRefVectorOf: Miscellaneous
// ---------------------------------------------------------------------------
template <class TElem> void BaseRefVectorOf<TElem>::
-ensureExtraCapacity(const unsigned int length)
+ensureExtraCapacity(const XMLSize_t length)
{
- unsigned int newMax = fCurCount + length;
+ XMLSize_t newMax = fCurCount + length;
if (newMax <= fMaxCount)
return;
@@ -278,7 +278,7 @@
(
newMax * sizeof(TElem*)
);//new TElem*[newMax];
- unsigned int index = 0;
+ XMLSize_t index = 0;
for (; index < fCurCount; index++)
newList[index] = fElemList[index];
Modified: xerces/c/trunk/src/xercesc/util/BaseRefVectorOf.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BaseRefVectorOf.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BaseRefVectorOf.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/BaseRefVectorOf.hpp Tue Jul 15 06:27:32 2008
@@ -44,7 +44,7 @@
// -----------------------------------------------------------------------
BaseRefVectorOf
(
- const unsigned int maxElems
+ const XMLSize_t maxElems
, const bool adoptElems = true
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -55,11 +55,11 @@
// Element management
// -----------------------------------------------------------------------
void addElement(TElem* const toAdd);
- virtual void setElementAt(TElem* const toSet, const unsigned int setAt);
- void insertElementAt(TElem* const toInsert, const unsigned int insertAt);
- TElem* orphanElementAt(const unsigned int orphanAt);
+ virtual void setElementAt(TElem* const toSet, const XMLSize_t setAt);
+ void insertElementAt(TElem* const toInsert, const XMLSize_t insertAt);
+ TElem* orphanElementAt(const XMLSize_t orphanAt);
virtual void removeAllElements();
- virtual void removeElementAt(const unsigned int removeAt);
+ virtual void removeElementAt(const XMLSize_t removeAt);
virtual void removeLastElement();
bool containsElement(const TElem* const toCheck);
virtual void cleanup();
@@ -69,17 +69,17 @@
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
- unsigned int curCapacity() const;
- const TElem* elementAt(const unsigned int getAt) const;
- TElem* elementAt(const unsigned int getAt);
- unsigned int size() const;
+ XMLSize_t curCapacity() const;
+ const TElem* elementAt(const XMLSize_t getAt) const;
+ TElem* elementAt(const XMLSize_t getAt);
+ XMLSize_t size() const;
MemoryManager* getMemoryManager() const;
// -----------------------------------------------------------------------
// Miscellaneous
// -----------------------------------------------------------------------
- void ensureExtraCapacity(const unsigned int length);
+ void ensureExtraCapacity(const XMLSize_t length);
private:
// -----------------------------------------------------------------------
@@ -93,8 +93,8 @@
// Data members
// -----------------------------------------------------------------------
bool fAdoptedElems;
- unsigned int fCurCount;
- unsigned int fMaxCount;
+ XMLSize_t fCurCount;
+ XMLSize_t fMaxCount;
TElem** fElemList;
MemoryManager* fMemoryManager;
};
@@ -145,7 +145,7 @@
// The reference vector being enumerated.
// -----------------------------------------------------------------------
bool fAdopted;
- unsigned int fCurIndex;
+ XMLSize_t fCurIndex;
BaseRefVectorOf<TElem>* fToEnum;
};
Modified: xerces/c/trunk/src/xercesc/util/BitSet.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BitSet.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BitSet.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/BitSet.cpp Tue Jul 15 06:27:32 2008
@@ -38,15 +38,15 @@
// kGrowBy
// The minimum allocation units to grow the buffer by.
// ---------------------------------------------------------------------------
-const unsigned int kBitsPerUnit = 32;
-const unsigned int kGrowBy = 1;
+const XMLSize_t kBitsPerUnit = 32;
+const XMLSize_t kGrowBy = 1;
// ---------------------------------------------------------------------------
// BitSet: Constructors and Destructor
// ---------------------------------------------------------------------------
-BitSet::BitSet( const unsigned int size
+BitSet::BitSet( const XMLSize_t size
, MemoryManager* const manager) :
fMemoryManager(manager)
@@ -66,7 +66,7 @@
(
fUnitLen * sizeof(unsigned long)
); //new unsigned long[fUnitLen];
- for (unsigned int i = 0; i < fUnitLen; i++)
+ for (XMLSize_t i = 0; i < fUnitLen; i++)
fBits[i] = toCopy.fBits[i];
}
@@ -87,7 +87,7 @@
if (fUnitLen != other.fUnitLen)
return false;
- for (unsigned int i = 0; i < fUnitLen; i++)
+ for (XMLSize_t i = 0; i < fUnitLen; i++)
{
if (fBits[i] != other.fBits[i])
return false;
@@ -99,10 +99,10 @@
// ---------------------------------------------------------------------------
// BitSet: Getter methods
// ---------------------------------------------------------------------------
-bool BitSet::get(const unsigned int index) const
+bool BitSet::get(const XMLSize_t index) const
{
- const unsigned int unitOfBit = (index / kBitsPerUnit);
- const unsigned int bitWithinUnit = index % kBitsPerUnit;
+ const XMLSize_t unitOfBit = (index / kBitsPerUnit);
+ const XMLSize_t bitWithinUnit = index % kBitsPerUnit;
//
// If the index is beyond our size, don't actually expand. Just return
@@ -118,7 +118,7 @@
}
-unsigned int BitSet::size() const
+XMLSize_t BitSet::size() const
{
return fUnitLen * kBitsPerUnit;
}
@@ -130,7 +130,7 @@
// ---------------------------------------------------------------------------
bool BitSet::allAreCleared() const
{
- for (unsigned int index = 0; index < fUnitLen; index++)
+ for (XMLSize_t index = 0; index < fUnitLen; index++)
{
if (fBits[index])
return false;
@@ -140,7 +140,7 @@
bool BitSet::allAreSet() const
{
- for (unsigned int index = 0; index < fUnitLen; index++)
+ for (XMLSize_t index = 0; index < fUnitLen; index++)
{
if (fBits[index] != 0xFFFFFFFF)
return false;
@@ -151,27 +151,27 @@
void BitSet::clearAll()
{
// Just zero out all the units
- for (unsigned int index = 0; index < fUnitLen; index++)
+ for (XMLSize_t index = 0; index < fUnitLen; index++)
fBits[index] = 0;
}
-void BitSet::clear(const unsigned int index)
+void BitSet::clear(const XMLSize_t index)
{
ensureCapacity(index+1);
- const int unitOfBit = (index / kBitsPerUnit);
- const int bitWithinUnit = index % kBitsPerUnit;
+ const XMLSize_t unitOfBit = (index / kBitsPerUnit);
+ const XMLSize_t bitWithinUnit = index % kBitsPerUnit;
fBits[unitOfBit] &= ~(1UL << bitWithinUnit);
}
-void BitSet::set(const unsigned int index)
+void BitSet::set(const XMLSize_t index)
{
ensureCapacity(index+1);
- const int unitOfBit = (index / kBitsPerUnit);
- const int bitWithinUnit = index % kBitsPerUnit;
+ const XMLSize_t unitOfBit = (index / kBitsPerUnit);
+ const XMLSize_t bitWithinUnit = index % kBitsPerUnit;
fBits[unitOfBit] |= (1UL << bitWithinUnit);
}
@@ -186,7 +186,7 @@
if (fUnitLen < other.fUnitLen)
ensureCapacity(other.fUnitLen * kBitsPerUnit);
- for (unsigned int index = 0; index < other.fUnitLen; index++)
+ for (XMLSize_t index = 0; index < other.fUnitLen; index++)
fBits[index] &= other.fBits[index];
}
@@ -196,7 +196,7 @@
if (fUnitLen < other.fUnitLen)
ensureCapacity(other.fUnitLen * kBitsPerUnit);
- for (unsigned int index = 0; index < other.fUnitLen; index++)
+ for (XMLSize_t index = 0; index < other.fUnitLen; index++)
fBits[index] |= other.fBits[index];
}
@@ -206,7 +206,7 @@
if (fUnitLen < other.fUnitLen)
ensureCapacity(other.fUnitLen * kBitsPerUnit);
- for (unsigned int index = 0; index < other.fUnitLen; index++)
+ for (XMLSize_t index = 0; index < other.fUnitLen; index++)
fBits[index] ^= other.fBits[index];
}
@@ -215,13 +215,13 @@
// ---------------------------------------------------------------------------
// BitSet: Miscellaneous methods
// ---------------------------------------------------------------------------
-unsigned int BitSet::hash(const unsigned int hashModulus) const
+XMLSize_t BitSet::hash(const XMLSize_t hashModulus) const
{
const unsigned char* pBytes = (const unsigned char*)fBits;
- const unsigned int len = fUnitLen * sizeof(unsigned long);
+ const XMLSize_t len = fUnitLen * sizeof(unsigned long);
- unsigned int hashVal = 0;
- for (unsigned int index = 0; index < len; index++)
+ XMLSize_t hashVal = 0;
+ for (XMLSize_t index = 0; index < len; index++)
{
hashVal <<= 1;
hashVal ^= *pBytes;
@@ -234,14 +234,14 @@
// ---------------------------------------------------------------------------
// BitSet: Private methods
// ---------------------------------------------------------------------------
-void BitSet::ensureCapacity(const unsigned int size)
+void BitSet::ensureCapacity(const XMLSize_t size)
{
// If we have enough space, do nothing
if(fUnitLen * kBitsPerUnit >= size)
return;
// Calculate the units required to hold the passed bit count.
- unsigned int unitsNeeded = size / kBitsPerUnit;
+ XMLSize_t unitsNeeded = size / kBitsPerUnit;
if (size % kBitsPerUnit)
unitsNeeded++;
@@ -255,7 +255,7 @@
unitsNeeded * sizeof(unsigned long)
); //new unsigned long[unitsNeeded];
- unsigned int index;
+ XMLSize_t index;
for (index = 0; index < fUnitLen; index++)
newBits[index] = fBits[index];
Modified: xerces/c/trunk/src/xercesc/util/BitSet.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BitSet.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BitSet.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/BitSet.hpp Tue Jul 15 06:27:32 2008
@@ -33,7 +33,7 @@
// -----------------------------------------------------------------------
// Constructors and Destructor
// -----------------------------------------------------------------------
- BitSet( const unsigned int size
+ BitSet( const XMLSize_t size
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
BitSet(const BitSet& toCopy);
~BitSet();
@@ -50,16 +50,16 @@
// -----------------------------------------------------------------------
bool allAreCleared() const;
bool allAreSet() const;
- unsigned int size() const;
- bool get(const unsigned int index) const;
+ XMLSize_t size() const;
+ bool get(const XMLSize_t index) const;
// -----------------------------------------------------------------------
// Setter methods
// -----------------------------------------------------------------------
- void clear(const unsigned int index);
+ void clear(const XMLSize_t index);
void clearAll();
- void set(const unsigned int index);
+ void set(const XMLSize_t index);
// -----------------------------------------------------------------------
@@ -73,7 +73,7 @@
// -----------------------------------------------------------------------
// Miscellaneous
// -----------------------------------------------------------------------
- unsigned int hash(const unsigned int hashModulus) const;
+ XMLSize_t hash(const XMLSize_t hashModulus) const;
private :
@@ -85,7 +85,7 @@
// -----------------------------------------------------------------------
// Private methods
// -----------------------------------------------------------------------
- void ensureCapacity(const unsigned int bits);
+ void ensureCapacity(const XMLSize_t bits);
// -----------------------------------------------------------------------
@@ -99,7 +99,7 @@
// -----------------------------------------------------------------------
MemoryManager* fMemoryManager;
unsigned long* fBits;
- unsigned int fUnitLen;
+ XMLSize_t fUnitLen;
};
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/util/HashBase.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/HashBase.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/HashBase.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/HashBase.hpp Tue Jul 15 06:27:32 2008
@@ -45,7 +45,7 @@
* @param key the key to be hashed
* @param mod the modulus the hasher should use
*/
- virtual unsigned int getHashVal(const void *const key, unsigned int mod
+ virtual XMLSize_t getHashVal(const void *const key, XMLSize_t mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager) = 0;
/**
Modified: xerces/c/trunk/src/xercesc/util/HashCMStateSet.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/HashCMStateSet.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/HashCMStateSet.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/HashCMStateSet.hpp Tue Jul 15 06:27:32 2008
@@ -40,7 +40,7 @@
public:
HashCMStateSet();
virtual ~HashCMStateSet();
- virtual unsigned int getHashVal(const void *const key, unsigned int mod
+ virtual XMLSize_t getHashVal(const void *const key, XMLSize_t mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
private:
@@ -59,7 +59,7 @@
{
}
-inline unsigned int HashCMStateSet::getHashVal(const void *const key, unsigned int mod
+inline XMLSize_t HashCMStateSet::getHashVal(const void *const key, XMLSize_t mod
, MemoryManager* const)
{
const CMStateSet* const pkey = (const CMStateSet*) key;
Modified: xerces/c/trunk/src/xercesc/util/HashPtr.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/HashPtr.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/HashPtr.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/HashPtr.cpp Tue Jul 15 06:27:32 2008
@@ -27,10 +27,10 @@
{
}
-unsigned int HashPtr::getHashVal(const void *const key, unsigned int mod
+XMLSize_t HashPtr::getHashVal(const void *const key, XMLSize_t mod
, MemoryManager* const)
{
- return (unsigned int)(((XMLSize_t)key) % mod);
+ return (((XMLSize_t)key) % mod);
}
bool HashPtr::equals(const void *const key1, const void *const key2)
Modified: xerces/c/trunk/src/xercesc/util/HashPtr.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/HashPtr.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/HashPtr.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/HashPtr.hpp Tue Jul 15 06:27:32 2008
@@ -39,7 +39,7 @@
public:
HashPtr();
virtual ~HashPtr();
- virtual unsigned int getHashVal(const void *const key, unsigned int mod
+ virtual XMLSize_t getHashVal(const void *const key, XMLSize_t mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
private:
Modified: xerces/c/trunk/src/xercesc/util/HashXMLCh.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/HashXMLCh.cpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/HashXMLCh.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/HashXMLCh.cpp Tue Jul 15 06:27:32 2008
@@ -28,7 +28,7 @@
{
}
-unsigned int HashXMLCh::getHashVal(const void *const key, unsigned int mod
+XMLSize_t HashXMLCh::getHashVal(const void *const key, XMLSize_t mod
, MemoryManager* const manager)
{
return XMLString::hash((XMLCh*)key, mod, manager);
Modified: xerces/c/trunk/src/xercesc/util/HashXMLCh.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/HashXMLCh.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/HashXMLCh.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/HashXMLCh.hpp Tue Jul 15 06:27:32 2008
@@ -39,7 +39,7 @@
public:
HashXMLCh();
virtual ~HashXMLCh();
- virtual unsigned int getHashVal(const void *const key, unsigned int mod
+ virtual XMLSize_t getHashVal(const void *const key, XMLSize_t mod
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
virtual bool equals(const void *const key1, const void *const key2);
private:
Modified: xerces/c/trunk/src/xercesc/util/RefArrayOf.c
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/RefArrayOf.c?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/RefArrayOf.c (original)
+++ xerces/c/trunk/src/xercesc/util/RefArrayOf.c Tue Jul 15 06:27:32 2008
@@ -33,7 +33,7 @@
// RefArrayOf: Contructors and Destructor
// ---------------------------------------------------------------------------
template <class TElem>
-RefArrayOf<TElem>::RefArrayOf(const unsigned int size,
+RefArrayOf<TElem>::RefArrayOf(const XMLSize_t size,
MemoryManager* const manager) :
fSize(size)
@@ -41,13 +41,13 @@
, fMemoryManager(manager)
{
fArray = (TElem**) fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
- for (unsigned int index = 0; index < fSize; index++)
+ for (XMLSize_t index = 0; index < fSize; index++)
fArray[index] = 0;
}
template <class TElem>
RefArrayOf<TElem>::RefArrayOf(TElem* values[],
- const unsigned int size,
+ const XMLSize_t size,
MemoryManager* const manager) :
fSize(size)
@@ -55,7 +55,7 @@
, fMemoryManager(manager)
{
fArray = (TElem**) fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
- for (unsigned int index = 0; index < fSize; index++)
+ for (XMLSize_t index = 0; index < fSize; index++)
fArray[index] = values[index];
}
@@ -67,7 +67,7 @@
, fMemoryManager(source.fMemoryManager)
{
fArray = (TElem**) fMemoryManager->allocate(fSize * sizeof(TElem*));//new TElem*[fSize];
- for (unsigned int index = 0; index < fSize; index++)
+ for (XMLSize_t index = 0; index < fSize; index++)
fArray[index] = source.fArray[index];
}
@@ -81,7 +81,7 @@
// RefArrayOf: Public operators
// ---------------------------------------------------------------------------
template <class TElem> TElem*& RefArrayOf<TElem>::
-operator[](const unsigned int index)
+operator[](const XMLSize_t index)
{
if (index >= fSize)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, fMemoryManager);
@@ -89,7 +89,7 @@
}
template <class TElem> const TElem* RefArrayOf<TElem>::
-operator[](const unsigned int index) const
+operator[](const XMLSize_t index) const
{
if (index >= fSize)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, fMemoryManager);
@@ -111,7 +111,7 @@
}
// Copy over the source elements
- for (unsigned int index = 0; index < fSize; index++)
+ for (XMLSize_t index = 0; index < fSize; index++)
fArray[index] = toAssign.fArray[index];
return *this;
@@ -126,7 +126,7 @@
if (fSize != toCompare.fSize)
return false;
- for (unsigned int index = 0; index < fSize; index++)
+ for (XMLSize_t index = 0; index < fSize; index++)
{
if (fArray[index] != toCompare.fArray[index])
return false;
@@ -144,17 +144,17 @@
// ---------------------------------------------------------------------------
// RefArrayOf: Copy operations
// ---------------------------------------------------------------------------
-template <class TElem> unsigned int RefArrayOf<TElem>::
+template <class TElem> XMLSize_t RefArrayOf<TElem>::
copyFrom(const RefArrayOf<TElem>& srcArray)
{
//
// Copy over as many of the source elements as will fit into
// this array.
//
- const unsigned int count = fSize < srcArray.fSize ?
+ const XMLSize_t count = fSize < srcArray.fSize ?
fSize : srcArray.fSize;
- for (unsigned int index = 0; index < fSize; index++)
+ for (XMLSize_t index = 0; index < fSize; index++)
fArray[index] = srcArray.fArray[index];
return count;
@@ -164,7 +164,7 @@
// ---------------------------------------------------------------------------
// RefArrayOf: Getter methods
// ---------------------------------------------------------------------------
-template <class TElem> unsigned int RefArrayOf<TElem>::length() const
+template <class TElem> XMLSize_t RefArrayOf<TElem>::length() const
{
return fSize;
}
@@ -178,7 +178,7 @@
// ---------------------------------------------------------------------------
// RefArrayOf: Element management methods
// ---------------------------------------------------------------------------
-template <class TElem> void RefArrayOf<TElem>::deleteAt(const unsigned int index)
+template <class TElem> void RefArrayOf<TElem>::deleteAt(const XMLSize_t index)
{
if (index >= fSize)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Array_BadIndex, fMemoryManager);
@@ -189,14 +189,14 @@
template <class TElem> void RefArrayOf<TElem>::deleteAllElements()
{
- for (unsigned int index = 0; index < fSize; index++)
+ for (XMLSize_t index = 0; index < fSize; index++)
{
delete fArray[index];
fArray[index] = 0;
}
}
-template <class TElem> void RefArrayOf<TElem>::resize(const unsigned int newSize)
+template <class TElem> void RefArrayOf<TElem>::resize(const XMLSize_t newSize)
{
if (newSize == fSize)
return;
@@ -211,7 +211,7 @@
);//new TElem*[newSize];
// Copy the existing values
- unsigned int index = 0;
+ XMLSize_t index = 0;
for (; index < fSize; index++)
newArray[index] = fArray[index];
Modified: xerces/c/trunk/src/xercesc/util/RefArrayOf.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/RefArrayOf.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/RefArrayOf.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/RefArrayOf.hpp Tue Jul 15 06:27:32 2008
@@ -38,12 +38,12 @@
// -----------------------------------------------------------------------
RefArrayOf
(
- const unsigned int size
+ const XMLSize_t size
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
RefArrayOf
(
TElem* values[]
- , const unsigned int size
+ , const XMLSize_t size
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
RefArrayOf(const RefArrayOf<TElem>& source);
~RefArrayOf();
@@ -52,8 +52,8 @@
// -----------------------------------------------------------------------
// Public operators
// -----------------------------------------------------------------------
- TElem*& operator[](const unsigned int index);
- const TElem* operator[](const unsigned int index) const;
+ TElem*& operator[](const XMLSize_t index);
+ const TElem* operator[](const XMLSize_t index) const;
RefArrayOf<TElem>& operator=(const RefArrayOf<TElem>& toAssign);
bool operator==(const RefArrayOf<TElem>& toCompare) const;
bool operator!=(const RefArrayOf<TElem>& toCompare) const;
@@ -62,29 +62,29 @@
// -----------------------------------------------------------------------
// Copy operations
// -----------------------------------------------------------------------
- unsigned int copyFrom(const RefArrayOf<TElem>& srcArray);
+ XMLSize_t copyFrom(const RefArrayOf<TElem>& srcArray);
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
- unsigned int length() const;
+ XMLSize_t length() const;
TElem** rawData() const;
// -----------------------------------------------------------------------
// Element management methods
// -----------------------------------------------------------------------
- void deleteAt(const unsigned int index);
+ void deleteAt(const XMLSize_t index);
void deleteAllElements();
- void resize(const unsigned int newSize);
+ void resize(const XMLSize_t newSize);
private :
// -----------------------------------------------------------------------
// Data members
// -----------------------------------------------------------------------
- unsigned int fSize;
+ XMLSize_t fSize;
TElem** fArray;
MemoryManager* fMemoryManager;
};
@@ -137,7 +137,7 @@
// The reference array being enumerated.
// -----------------------------------------------------------------------
bool fAdopted;
- unsigned int fCurIndex;
+ XMLSize_t fCurIndex;
RefArrayOf<TElem>* fToEnum;
};
Modified: xerces/c/trunk/src/xercesc/util/RefArrayVectorOf.c
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/RefArrayVectorOf.c?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/RefArrayVectorOf.c (original)
+++ xerces/c/trunk/src/xercesc/util/RefArrayVectorOf.c Tue Jul 15 06:27:32 2008
@@ -28,7 +28,7 @@
// RefArrayVectorOf: Constructor and Destructor
// ---------------------------------------------------------------------------
template <class TElem>
-RefArrayVectorOf<TElem>::RefArrayVectorOf( const unsigned int maxElems
+RefArrayVectorOf<TElem>::RefArrayVectorOf( const XMLSize_t maxElems
, const bool adoptElems
, MemoryManager* const manager)
: BaseRefVectorOf<TElem>(maxElems, adoptElems, manager)
@@ -40,14 +40,14 @@
{
if (this->fAdoptedElems)
{
- for (unsigned int index = 0; index < this->fCurCount; index++)
+ for (XMLSize_t index = 0; index < this->fCurCount; index++)
this->fMemoryManager->deallocate(this->fElemList[index]);//delete[] fElemList[index];
}
this->fMemoryManager->deallocate(this->fElemList);//delete [] fElemList;
}
template <class TElem> void
-RefArrayVectorOf<TElem>::setElementAt(TElem* const toSet, const unsigned int setAt)
+RefArrayVectorOf<TElem>::setElementAt(TElem* const toSet, const XMLSize_t setAt)
{
if (setAt >= this->fCurCount)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex, this->fMemoryManager);
@@ -60,10 +60,10 @@
template <class TElem> void RefArrayVectorOf<TElem>::removeAllElements()
{
- for (unsigned int index = 0; index < this->fCurCount; index++)
+ for (XMLSize_t index = 0; index < this->fCurCount; index++)
{
if (this->fAdoptedElems)
- this->fMemoryManager->deallocate(this->fElemList[index]);
+ this->fMemoryManager->deallocate(this->fElemList[index]);
// Keep unused elements zero for sanity's sake
this->fElemList[index] = 0;
@@ -72,7 +72,7 @@
}
template <class TElem> void RefArrayVectorOf<TElem>::
-removeElementAt(const unsigned int removeAt)
+removeElementAt(const XMLSize_t removeAt)
{
if (removeAt >= this->fCurCount)
ThrowXMLwithMemMgr(ArrayIndexOutOfBoundsException, XMLExcepts::Vector_BadIndex, this->fMemoryManager);
@@ -89,7 +89,7 @@
}
// Copy down every element above remove point
- for (unsigned int index = removeAt; index < this->fCurCount-1; index++)
+ for (XMLSize_t index = removeAt; index < this->fCurCount-1; index++)
this->fElemList[index] = this->fElemList[index+1];
// Keep unused elements zero for sanity's sake
@@ -113,7 +113,7 @@
{
if (this->fAdoptedElems)
{
- for (unsigned int index = 0; index < this->fCurCount; index++)
+ for (XMLSize_t index = 0; index < this->fCurCount; index++)
this->fMemoryManager->deallocate(this->fElemList[index]);
}
this->fMemoryManager->deallocate(this->fElemList);//delete [] fElemList;
Modified: xerces/c/trunk/src/xercesc/util/RefArrayVectorOf.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/RefArrayVectorOf.hpp?rev=676911&r1=676910&r2=676911&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/RefArrayVectorOf.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/RefArrayVectorOf.hpp Tue Jul 15 06:27:32 2008
@@ -36,7 +36,7 @@
// -----------------------------------------------------------------------
// Constructor
// -----------------------------------------------------------------------
- RefArrayVectorOf( const unsigned int maxElems
+ RefArrayVectorOf( const XMLSize_t maxElems
, const bool adoptElems = true
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
@@ -48,9 +48,9 @@
// -----------------------------------------------------------------------
// Element management
// -----------------------------------------------------------------------
- void setElementAt(TElem* const toSet, const unsigned int setAt);
+ void setElementAt(TElem* const toSet, const XMLSize_t setAt);
void removeAllElements();
- void removeElementAt(const unsigned int removeAt);
+ void removeElementAt(const XMLSize_t removeAt);
void removeLastElement();
void cleanup();
private:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org