Author: amassari
Date: Thu Jul 24 05:09:39 2008
New Revision: 679382
URL: http://svn.apache.org/viewvc?rev=679382&view=rev
Log:
XMLSize_t fix
Modified:
xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp
xerces/c/trunk/src/xercesc/util/Hashers.hpp (contents, props changed)
xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Selector.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.hpp
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp?rev=679382&r1=679381&r2=679382&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp Thu Jul 24
05:09:39 2008
@@ -184,7 +184,7 @@
true));
}
matcher->startElement(elemDecl, uriId, node->getPrefix(), attrList,
attrCount);
- int nMatch=matcher->isMatched();
+ unsigned char nMatch=matcher->isMatched();
if(nMatch!=0 && nMatch!=XPathMatcher::XP_MATCHED_DP)
{
result->addResult(node);
Modified: xerces/c/trunk/src/xercesc/util/Hashers.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Hashers.hpp?rev=679382&r1=679381&r2=679382&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Hashers.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Hashers.hpp Thu Jul 24 05:09:39 2008
@@ -16,7 +16,7 @@
*/
/*
- * $Id: HashBase.hpp 678144 2008-07-19 12:08:55Z borisk $
+ * $Id$
*/
#if !defined(XERCESC_INCLUDE_GUARD_HASHERS_HPP)
Propchange: xerces/c/trunk/src/xercesc/util/Hashers.hpp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Jul 24 05:09:39 2008
@@ -0,0 +1 @@
+Author Date Id Revision
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Selector.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Selector.cpp?rev=679382&r1=679381&r2=679382&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Selector.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Selector.cpp Thu
Jul 24 05:09:39 2008
@@ -67,7 +67,7 @@
fElementDepth++;
// activate the fields, if selector is matched
- int matched = isMatched();
+ unsigned char matched = isMatched();
if ((fMatchedDepth == -1 && ((matched & XP_MATCHED) == XP_MATCHED))
|| ((matched & XP_MATCHED_D) == XP_MATCHED_D)) {
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp?rev=679382&r1=679381&r2=679382&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.cpp Thu
Jul 24 05:09:39 2008
@@ -109,22 +109,22 @@
if (fLocationPathSize) {
- fStepIndexes = new (fMemoryManager) RefVectorOf<ValueStackOf<int>
>(fLocationPathSize, true, fMemoryManager);
- fCurrentStep = (int*) fMemoryManager->allocate
+ fStepIndexes = new (fMemoryManager)
RefVectorOf<ValueStackOf<XMLSize_t> >(fLocationPathSize, true, fMemoryManager);
+ fCurrentStep = (XMLSize_t*) fMemoryManager->allocate
(
- fLocationPathSize * sizeof(int)
+ fLocationPathSize * sizeof(XMLSize_t)
);//new int[fLocationPathSize];
- fNoMatchDepth = (int*) fMemoryManager->allocate
+ fNoMatchDepth = (XMLSize_t*) fMemoryManager->allocate
(
- fLocationPathSize * sizeof(int)
+ fLocationPathSize * sizeof(XMLSize_t)
);//new int[fLocationPathSize];
- fMatched = (int*) fMemoryManager->allocate
+ fMatched = (unsigned char*) fMemoryManager->allocate
(
- fLocationPathSize * sizeof(int)
+ fLocationPathSize * sizeof(unsigned char)
);//new int[fLocationPathSize];
for(XMLSize_t i=0; i < fLocationPathSize; i++) {
- fStepIndexes->addElement(new (fMemoryManager)
ValueStackOf<int>(8, fMemoryManager));
+ fStepIndexes->addElement(new (fMemoryManager)
ValueStackOf<XMLSize_t>(8, fMemoryManager));
}
}
}
@@ -154,7 +154,7 @@
for (XMLSize_t i = 0; i < fLocationPathSize; i++) {
// push context
- int startStep = fCurrentStep[i];
+ XMLSize_t startStep = fCurrentStep[i];
fStepIndexes->elementAt(i)->push(startStep);
// try next xpath, if not matching
@@ -186,7 +186,7 @@
// step do its thing; if it fails, we reset ourselves
// to look at this step for next time we're called.
// so first consume all descendants:
- int descendantStep = fCurrentStep[i];
+ XMLSize_t descendantStep = fCurrentStep[i];
while (fCurrentStep[i] < stepSize &&
locPath->getStep(fCurrentStep[i])->getAxisType() ==
XercesStep::AxisType_DESCENDANT) {
@@ -324,7 +324,7 @@
// ---------------------------------------------------------------------------
// XPathMatcher: Match methods
// ---------------------------------------------------------------------------
-int XPathMatcher::isMatched() {
+unsigned char XPathMatcher::isMatched() {
// xpath has been matched if any one of the members of the union have
matched.
for (XMLSize_t i=0; i < fLocationPathSize; i++) {
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.hpp?rev=679382&r1=679381&r2=679382&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.hpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/XPathMatcher.hpp Thu
Jul 24 05:09:39 2008
@@ -70,7 +70,7 @@
/**
* Returns true if XPath has been matched.
*/
- int isMatched();
+ unsigned char isMatched();
virtual int getInitialDepth() const;
// -----------------------------------------------------------------------
@@ -147,14 +147,14 @@
// selectors.
//
// -----------------------------------------------------------------------
- XMLSize_t fLocationPathSize;
- int* fMatched;
- int* fNoMatchDepth;
- int* fCurrentStep;
- RefVectorOf<ValueStackOf<int> >* fStepIndexes;
- RefVectorOf<XercesLocationPath>* fLocationPaths;
- IdentityConstraint* fIdentityConstraint;
- MemoryManager* fMemoryManager;
+ XMLSize_t fLocationPathSize;
+ unsigned char* fMatched;
+ XMLSize_t* fNoMatchDepth;
+ XMLSize_t* fCurrentStep;
+ RefVectorOf<ValueStackOf<XMLSize_t> >* fStepIndexes;
+ RefVectorOf<XercesLocationPath>* fLocationPaths;
+ IdentityConstraint* fIdentityConstraint;
+ MemoryManager* fMemoryManager;
};
// ---------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
