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/01/08 14:30:49 UTC
svn commit: r609971 - in /xerces/c/trunk: src/xercesc/internal/
src/xercesc/util/regx/ src/xercesc/validators/schema/ tests/src/ThreadTest/
Author: amassari
Date: Tue Jan 8 05:30:47 2008
New Revision: 609971
URL: http://svn.apache.org/viewvc?rev=609971&view=rev
Log:
Fixed warnings detected by Intel Compiler
Modified:
xerces/c/trunk/src/xercesc/internal/ElemStack.hpp
xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp
xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp
xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp
Modified: xerces/c/trunk/src/xercesc/internal/ElemStack.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ElemStack.hpp?rev=609971&r1=609970&r2=609971&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ElemStack.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ElemStack.hpp Tue Jan 8 05:30:47 2008
@@ -112,7 +112,7 @@
bool fValidationFlag;
bool fCommentOrPISeen;
bool fReferenceEscaped;
- int fCurrentScope;
+ unsigned int fCurrentScope;
Grammar* fCurrentGrammar;
unsigned int fCurrentURI;
XMLCh * fSchemaElemName;
Modified: xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp?rev=609971&r1=609970&r2=609971&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSAXMLScanner.cpp Tue Jan 8 05:30:47 2008
@@ -225,7 +225,7 @@
// save the contentleafname and currentscope before addlevel, for later use
ContentLeafNameTypeVector* cv = 0;
XMLContentModel* cm = 0;
- int currentScope = Grammar::TOP_LEVEL_SCOPE;
+ unsigned int currentScope = Grammar::TOP_LEVEL_SCOPE;
bool laxThisOne = false;
if (!isRoot)
{
Modified: xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp?rev=609971&r1=609970&r2=609971&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp Tue Jan 8 05:30:47 2008
@@ -243,7 +243,7 @@
return false;
}
else if (RegxUtil::isLowSurrogate(ch)) {
- if ((offset -1 >= 0) && (direction <= 0) &&
+ if ((offset > 0) && (direction <= 0) &&
RegxUtil::isHighSurrogate(fString[offset-1])) {
ch = RegxUtil::composeFromSurrogate(fString[--offset], ch);
}
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp?rev=609971&r1=609970&r2=609971&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp Tue Jan 8 05:30:47 2008
@@ -59,7 +59,7 @@
, const XMLCh* const localPart
, const int uriId
, const SchemaElementDecl::ModelTypes type
- , const int enclosingScope
+ , const unsigned int enclosingScope
, MemoryManager* const manager) :
XMLElementDecl(manager)
, fModelType(type)
@@ -81,7 +81,7 @@
SchemaElementDecl::SchemaElementDecl(const QName* const elementName
, const SchemaElementDecl::ModelTypes type
- , const int enclosingScope
+ , const unsigned int enclosingScope
, MemoryManager* const manager) :
XMLElementDecl(manager)
, fModelType(type)
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp?rev=609971&r1=609970&r2=609971&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp Tue Jan 8 05:30:47 2008
@@ -71,7 +71,7 @@
, const XMLCh* const localPart
, const int uriId
, const ModelTypes modelType = Any
- , const int enclosingScope = Grammar::TOP_LEVEL_SCOPE
+ , const unsigned int enclosingScope = Grammar::TOP_LEVEL_SCOPE
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -79,7 +79,7 @@
(
const QName* const elementName
, const ModelTypes modelType = Any
- , const int enclosingScope = Grammar::TOP_LEVEL_SCOPE
+ , const unsigned int enclosingScope = Grammar::TOP_LEVEL_SCOPE
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?rev=609971&r1=609970&r2=609971&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Tue Jan 8 05:30:47 2008
@@ -5768,7 +5768,7 @@
const XMLCh*& valConstraint,
const bool topLevel)
{
- int enclosingScope = fCurrentScope;
+ unsigned int enclosingScope = fCurrentScope;
int uriIndex = fEmptyNamespaceURI;
if (topLevel) {
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp?rev=609971&r1=609970&r2=609971&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.hpp Tue Jan 8 05:30:47 2008
@@ -726,8 +726,8 @@
bool fFullConstraintChecking;
int fTargetNSURI;
int fEmptyNamespaceURI;
- int fCurrentScope;
- int fScopeCount;
+ unsigned int fCurrentScope;
+ unsigned int fScopeCount;
unsigned int fAnonXSTypeCount;
unsigned int fCircularCheckIndex;
const XMLCh* fTargetNSURIString;
Modified: xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp?rev=609971&r1=609970&r2=609971&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp (original)
+++ xerces/c/trunk/tests/src/ThreadTest/ThreadTest.cpp Tue Jan 8 05:30:47 2008
@@ -1109,7 +1109,7 @@
checkSum = thParser->getCheckSum();
}
fprintf(stderr, "\nThread %d: Parse Check sum error on file \"%s\" for parse # %d. Expected %x, got %x\n",
- thInfo->fThreadNum, thInfo->fParses, fInfo->fileName, fInfo->checkSum, checkSum);
+ thInfo->fThreadNum, fInfo->fileName, thInfo->fParses, fInfo->checkSum, checkSum);
double totalParsesCompleted = 0;
for (int threadNum=0; threadNum < gRunInfo.numThreads; threadNum++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org