Author: borisk
Date: Fri Jul 4 02:56:36 2008
New Revision: 673986
URL: http://svn.apache.org/viewvc?rev=673986&view=rev
Log:
Use "unsigned int" instead of just "unsigned" or "int unsigned". This way those
places are easier to identify for future conversion to XMLSize_t.
Modified:
xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
xerces/c/trunk/src/xercesc/util/BitSet.cpp
xerces/c/trunk/src/xercesc/util/NameIdPool.hpp
xerces/c/trunk/src/xercesc/util/RefHash3KeysIdPool.hpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp?rev=673986&r1=673985&r2=673986&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp Fri Jul 4 02:56:36
2008
@@ -1219,7 +1219,7 @@
// no element decl. The other uses in this scope will only
// be encountered if there continues to be no element decl--which
// implies that this will have been initialized correctly.
- unsigned orgGrammarUri = uriId;
+ unsigned int orgGrammarUri = uriId;
if (!elemDecl && ( orgGrammarUri =
fURIStringPool->getId(original_uriStr)) != uriId) {
// not found, switch to the specified grammar
const XMLCh* uriStr = getURIText(uriId);
@@ -1322,7 +1322,7 @@
// no element decl. The other uses in this scope will only
// be encountered if there continues to be no element decl--which
// implies that this will have been initialized correctly.
- unsigned orgGrammarUri = fEmptyNamespaceId;
+ unsigned int orgGrammarUri = fEmptyNamespaceId;
if (!elemDecl && (orgGrammarUri =
fURIStringPool->getId(original_uriStr)) != fEmptyNamespaceId) {
//not found, switch grammar and try globalNS
bool errorCondition = !switchGrammar(XMLUni::fgZeroLenString) &&
fValidate;
Modified: xerces/c/trunk/src/xercesc/util/BitSet.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/BitSet.cpp?rev=673986&r1=673985&r2=673986&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/BitSet.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/BitSet.cpp Fri Jul 4 02:56:36 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -218,7 +218,7 @@
unsigned int BitSet::hash(const unsigned int hashModulus) const
{
const unsigned char* pBytes = (const unsigned char*)fBits;
- const int unsigned len = fUnitLen * sizeof(unsigned long);
+ const unsigned int len = fUnitLen * sizeof(unsigned long);
unsigned int hashVal = 0;
for (unsigned int index = 0; index < len; index++)
Modified: xerces/c/trunk/src/xercesc/util/NameIdPool.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/NameIdPool.hpp?rev=673986&r1=673985&r2=673986&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/NameIdPool.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/NameIdPool.hpp Fri Jul 4 02:56:36 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -87,8 +87,8 @@
// -----------------------------------------------------------------------
TElem* getByKey(const XMLCh* const key);
const TElem* getByKey(const XMLCh* const key) const;
- TElem* getById(const unsigned elemId);
- const TElem* getById(const unsigned elemId) const;
+ TElem* getById(const unsigned int elemId);
+ const TElem* getById(const unsigned int elemId) const;
MemoryManager* getMemoryManager() const;
// -----------------------------------------------------------------------
@@ -173,7 +173,7 @@
(
const NameIdPoolEnumerator<TElem>& toAssign
);
-
+
// -----------------------------------------------------------------------
// Enum interface
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/util/RefHash3KeysIdPool.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/RefHash3KeysIdPool.hpp?rev=673986&r1=673985&r2=673986&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/RefHash3KeysIdPool.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/RefHash3KeysIdPool.hpp Fri Jul 4 02:56:36
2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
, fKey3(key3)
{
}
-
+
RefHash3KeysTableBucketElem() {};
~RefHash3KeysTableBucketElem() {};
@@ -133,8 +133,8 @@
TVal* getByKey(const void* const key1, const int key2, const int key3);
const TVal* getByKey(const void* const key1, const int key2, const int
key3) const;
- TVal* getById(const unsigned elemId);
- const TVal* getById(const unsigned elemId) const;
+ TVal* getById(const unsigned int elemId);
+ const TVal* getById(const unsigned int elemId) const;
MemoryManager* getMemoryManager() const;
unsigned int getHashModulus() const;
@@ -236,7 +236,7 @@
int size() const;
// -----------------------------------------------------------------------
- // New interface
+ // New interface
// -----------------------------------------------------------------------
void resetKey();
void nextElementKey(void*&, int&, int&);
@@ -245,7 +245,7 @@
private :
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
RefHash3KeysIdPoolEnumerator<TVal>& operator=(const
RefHash3KeysIdPoolEnumerator<TVal>&);
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp?rev=673986&r1=673985&r2=673986&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp Fri Jul 4
02:56:36 2008
@@ -1063,7 +1063,7 @@
if (subsElements) {
- unsigned subsElemSize = subsElements->size();
+ unsigned int subsElemSize = subsElements->size();
for (unsigned int j=0; j < subsElemSize; j++) {
@@ -1966,7 +1966,7 @@
);//new bool[baseCount];
ArrayJanitor<bool> janFoundIt(foundIt, fMemoryManager);
- for (unsigned k=0; k < baseCount; k++) {
+ for (unsigned int k=0; k < baseCount; k++) {
foundIt[k] = false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
