Author: borisk
Date: Thu Jul 24 04:15:19 2008
New Revision: 679359

URL: http://svn.apache.org/viewvc?rev=679359&view=rev
Log:
Use readSize/writeSize for XMLSize_t variables.

Modified:
    xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp
    xerces/c/trunk/src/xercesc/framework/XMLElementDecl.cpp
    xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp
    xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.cpp
    xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
    xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDef.cpp
    xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp
    xerces/c/trunk/src/xercesc/validators/datatype/AbstractStringValidator.cpp
    xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.cpp
    xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp
    xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp

Modified: xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp Thu Jul 24 04:15:19 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.
@@ -121,7 +121,7 @@
 
     fDefaultType(defType)
     , fType(type)
-    , fCreateReason(XMLAttDef::NoReason)    
+    , fCreateReason(XMLAttDef::NoReason)
     , fExternalAttribute(false)
     , fId(XMLAttDef::fgInvalidAttrId)
     , fValue(0)
@@ -140,7 +140,7 @@
 
     fDefaultType(defType)
     , fType(type)
-    , fCreateReason(XMLAttDef::NoReason)    
+    , fCreateReason(XMLAttDef::NoReason)
     , fExternalAttribute(false)
     , fId(XMLAttDef::fgInvalidAttrId)
     , fValue(0)
@@ -190,9 +190,9 @@
     {
         serEng<<(int)fDefaultType;
         serEng<<(int)fType;
-        serEng<<(int)fCreateReason;       
+        serEng<<(int)fCreateReason;
         serEng<<fExternalAttribute;
-        serEng<<fId;
+        serEng.writeSize (fId);
 
         serEng.writeString(fValue);
         serEng.writeString(fEnumeration);
@@ -208,9 +208,9 @@
 
         serEng>>i;
         fCreateReason = (CreateReasons)i;
-       
+
         serEng>>fExternalAttribute;
-        serEng>>fId;
+        serEng.readSize (fId);
 
         serEng.readString(fValue);
         serEng.readString(fEnumeration);
@@ -218,4 +218,3 @@
 }
 
 XERCES_CPP_NAMESPACE_END
-

Modified: xerces/c/trunk/src/xercesc/framework/XMLElementDecl.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLElementDecl.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLElementDecl.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLElementDecl.cpp Thu Jul 24 04:15:19 
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.
@@ -112,7 +112,7 @@
     {
         serEng<<fElementName;
         serEng<<(int) fCreateReason;
-        serEng<<fId;
+        serEng.writeSize (fId);
         serEng<<fExternalElement;
     }
     else
@@ -123,13 +123,13 @@
         serEng>>i;
         fCreateReason=(CreateReasons)i;
 
-        serEng>>fId;
+        serEng.readSize (fId);
         serEng>>fExternalElement;
     }
 
 }
 
-void 
+void
 XMLElementDecl::storeElementDecl(XSerializeEngine&        serEng
                                , XMLElementDecl*    const element)
 {
@@ -144,7 +144,7 @@
     }
 }
 
-XMLElementDecl* 
+XMLElementDecl*
 XMLElementDecl::loadElementDecl(XSerializeEngine& serEng)
 {
     int type;
@@ -168,4 +168,3 @@
 }
 
 XERCES_CPP_NAMESPACE_END
-

Modified: xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLEntityDecl.cpp Thu Jul 24 04:15:19 
2008
@@ -173,8 +173,8 @@
 
     if (serEng.isStoring())
     {
-        serEng<<fId;
-        serEng<<(XMLSize_t)fValueLen;
+        serEng.writeSize (fId);
+        serEng.writeSize (fValueLen);
         serEng.writeString(fValue);
         serEng.writeString(fName);
         serEng.writeString(fNotationName);
@@ -185,10 +185,8 @@
     }
     else
     {
-        serEng>>fId;
-        XMLSize_t temp;
-        serEng>>temp;
-        fValueLen=temp;
+        serEng.readSize (fId);
+        serEng.readSize (fValueLen);
         serEng.readString(fValue);
         serEng.readString(fName);
         serEng.readString(fNotationName);

Modified: xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLNotationDecl.cpp Thu Jul 24 
04:15:19 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.
@@ -118,7 +118,7 @@
 {
     if (serEng.isStoring())
     {
-        serEng<<fId;
+        serEng.writeSize (fId);
         serEng<<fNameSpaceId;
         serEng.writeString(fName);
         serEng.writeString(fPublicId);
@@ -127,7 +127,7 @@
     }
     else
     {
-        serEng>>fId;
+        serEng.readSize (fId);
         serEng>>fNameSpaceId;
         serEng.readString(fName);
         serEng.readString(fPublicId);

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=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp Thu Jul 24 
04:15:19 2008
@@ -704,7 +704,7 @@
     if(matches(XMLUni::fgZeroLenString, manager)){
         ThrowXMLwithMemMgr(RuntimeException, 
XMLExcepts::Regex_RepPatMatchesZeroString, manager);
     }
-      
+
     RefVectorOf<Match> *subEx = new (manager) RefVectorOf<Match>(10, true, 
manager);
     Janitor<RefVectorOf<Match> > janSubEx(subEx);
 
@@ -746,11 +746,11 @@
     while(matchStart <= end) {
         XMLSize_t matchEnd = match(&context, fOperations, matchStart);
         if(matchEnd != (XMLSize_t)-1) {
-            context.fMatch->setStartPos(0, matchStart);
-            context.fMatch->setEndPos(0, matchEnd);
+            context.fMatch->setStartPos(0, (int)matchStart);
+            context.fMatch->setEndPos(0, (int)matchEnd);
 
             subEx->addElement(context.fMatch);
-        
+
             context.fMatch = new (manager) Match(*(context.fMatch));
             context.fAdoptMatch = true;
 
@@ -814,14 +814,14 @@
     if(matches(XMLUni::fgZeroLenString, manager)){
         ThrowXMLwithMemMgr(RuntimeException, 
XMLExcepts::Regex_RepPatMatchesZeroString, manager);
     }
-      
+
     RefVectorOf<Match> *subEx = new (manager) RefVectorOf<Match>(10, true, 
manager);
     Janitor<RefVectorOf<Match> > janSubEx(subEx);
 
     allMatches(matchString, start, end, subEx, manager);
 
     XMLBuffer result(1023, manager);
-    int tokStart = start;
+    int tokStart = (int)start;
 
     XMLSize_t i = 0;
     for(; i < subEx->size(); ++i) {
@@ -843,15 +843,15 @@
 
 /*
  * Helper for Replace. This method prepares the replacement string by 
substituting
- * in actual values for parenthesized sub expressions. 
+ * in actual values for parenthesized sub expressions.
  *
  * An error will be thrown if:
  *  1) there is chBackSlash not followed by a chDollarSign or chBackSlash
  *  2) there is an unescaped chDollarSign which is not followed by a digit
  *
  */
-void RegularExpression::subInExp(const XMLCh* const repString, 
-                                 const XMLCh* const origString, 
+void RegularExpression::subInExp(const XMLCh* const repString,
+                                 const XMLCh* const origString,
                                  const Match* subEx,
                                  XMLBuffer &result,
                                  MemoryManager* const manager) const
@@ -861,7 +861,7 @@
     for(const XMLCh *ptr = repString; *ptr != chNull; ++ptr) {
         if(*ptr == chDollarSign) {
             ++ptr;
-      
+
             // check that after the $ is a digit
             if(!XMLString::isDigit(*ptr)) {
                 // invalid replace string - $ must be followed by a digit
@@ -896,7 +896,7 @@
                 ++ptr;
 
                 // if you have a slash and then a character that's not a $ or 
/,
-                // then it's an invalid replace string  
+                // then it's an invalid replace string
                 if(*ptr != chDollarSign && *ptr != chBackSlash) {
                     ThrowXMLwithMemMgr(RuntimeException, 
XMLExcepts::Regex_InvalidRepPattern, manager);
                 }
@@ -1609,4 +1609,3 @@
 /**
   *    End of file RegularExpression.cpp
   */
-

Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDef.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDef.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDef.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDef.cpp Thu Jul 24 04:15:19 
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.
@@ -92,12 +92,12 @@
 
     if (serEng.isStoring())
     {
-        serEng<<fElemId;
+        serEng.writeSize (fElemId);
         serEng.writeString(fName);
     }
     else
     {
-        serEng>>fElemId;
+        serEng.readSize (fElemId);
         serEng.readString(fName);
     }
 }

Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp Thu Jul 24 
04:15:19 2008
@@ -142,7 +142,7 @@
          *
          ***/
         XTemplateSerializer::storeObject(fList, serEng);
-        serEng << fCount;
+        serEng.writeSize (fCount);
 
         // do not serialize fEnum
     }
@@ -155,7 +155,7 @@
          ***/
         XTemplateSerializer::loadObject(&fList, 29, true, serEng);
         // assume empty so we can size fArray just right
-        serEng >> fSize;
+        serEng.readSize (fSize);
         if (!fEnum && fList)
         {
              fEnum = new (getMemoryManager()) 
RefHashTableOfEnumerator<DTDAttDef>(fList, false, getMemoryManager());

Modified: 
xerces/c/trunk/src/xercesc/validators/datatype/AbstractStringValidator.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/AbstractStringValidator.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/datatype/AbstractStringValidator.cpp 
(original)
+++ xerces/c/trunk/src/xercesc/validators/datatype/AbstractStringValidator.cpp 
Thu Jul 24 04:15:19 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.
@@ -299,11 +299,11 @@
 
      E2-35
      It is an error for both length and either of minLength or maxLength to be 
members of {facets},
-     unless they are specified in different derivation steps in which case the 
following must be true: 
-     the {value} of minLength <= the {value} of length <= the {value} of 
maxLength   
+     unless they are specified in different derivation steps in which case the 
following must be true:
+     the {value} of minLength <= the {value} of length <= the {value} of 
maxLength
     ***/
 
-    // error: length > base.maxLength 
+    // error: length > base.maxLength
     //        length < base.minLength
     if ((thisFacetsDefined & DatatypeValidator::FACET_LENGTH) !=0)
     {
@@ -315,7 +315,7 @@
                              , XMLExcepts::FACET_Len_baseMaxLen
                              , manager)
         }
-        
+
         if (((baseFacetsDefined & DatatypeValidator::FACET_MINLENGTH) !=0) &&
              (thisLength < baseMinLength)                                   )
         {
@@ -326,7 +326,7 @@
         }
     }
 
-    // error: baseLength > maxLength 
+    // error: baseLength > maxLength
     //        baseLength < minLength
     if ((baseFacetsDefined & DatatypeValidator::FACET_LENGTH) !=0)
     {
@@ -338,7 +338,7 @@
                              , XMLExcepts::FACET_maxLen_baseLen
                              , manager)
         }
-        
+
         if (((thisFacetsDefined & DatatypeValidator::FACET_MINLENGTH) !=0) &&
              (baseLength < thisMinLength)                                   )
         {
@@ -458,7 +458,7 @@
             // ask parent do a complete check
             pBaseValidator->checkContent(getEnumeration()->elementAt(i), 
(ValidationContext*)0, false, manager);
 #if 0
-// spec says that only base has to checkContent          
+// spec says that only base has to checkContent
             // enum shall pass this->checkContent() as well.
             checkContent(getEnumeration()->elementAt(i), 
(ValidationContext*)0, false, manager);
 #endif
@@ -647,17 +647,17 @@
 
 void AbstractStringValidator::normalizeEnumeration(MemoryManager* const 
manager)
 {
-    AbstractStringValidator *pBaseValidator = (AbstractStringValidator*) 
getBaseValidator();    
+    AbstractStringValidator *pBaseValidator = (AbstractStringValidator*) 
getBaseValidator();
 
-    if (!fEnumeration || !pBaseValidator) 
+    if (!fEnumeration || !pBaseValidator)
         return;
 
     int baseFacetsDefined = pBaseValidator->getFacetsDefined();
     if ((baseFacetsDefined & DatatypeValidator::FACET_WHITESPACE) == 0)
-        return;    
-    
-    short whiteSpace = pBaseValidator->getWSFacet();   
-            
+        return;
+
+    short whiteSpace = pBaseValidator->getWSFacet();
+
     if ( whiteSpace == DatatypeValidator::PRESERVE )
     {
         return;
@@ -676,8 +676,8 @@
         for ( XMLSize_t i=0; i < enumLength; i++)
         {
             XMLString::collapseWS(getEnumeration()->elementAt(i), manager);
-        }                
-    }   
+        }
+    }
 }
 
 void AbstractStringValidator::normalizeContent(XMLCh* const, MemoryManager* 
const) const
@@ -732,9 +732,9 @@
 
     if (serEng.isStoring())
     {
-        serEng<<fLength;
-        serEng<<fMaxLength;
-        serEng<<fMinLength;
+        serEng.writeSize (fLength);
+        serEng.writeSize (fMaxLength);
+        serEng.writeSize (fMinLength);
         serEng<<fEnumerationInherited;
 
         /***
@@ -747,14 +747,14 @@
     }
     else
     {
-        serEng>>fLength;
-        serEng>>fMaxLength;
-        serEng>>fMinLength;
+        serEng.readSize (fLength);
+        serEng.readSize (fMaxLength);
+        serEng.readSize (fMinLength);
         serEng>>fEnumerationInherited;
 
         /***
          *
-         *  Deserialize RefArrayVectorOf<XMLCh>         
+         *  Deserialize RefArrayVectorOf<XMLCh>
          *
         ***/
         XTemplateSerializer::loadObject(&fEnumeration, 8, true, serEng);

Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.cpp Thu Jul 24 
04:15:19 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.
@@ -44,9 +44,9 @@
 SchemaAttDef::SchemaAttDef(MemoryManager* const manager) :
     XMLAttDef(XMLAttDef::CData, XMLAttDef::Implied, manager)
     , fElemId(XMLElementDecl::fgInvalidElemId)
-    , fPSVIScope(PSVIDefs::SCP_ABSENT)    
+    , fPSVIScope(PSVIDefs::SCP_ABSENT)
     , fAttName(0)
-    , fDatatypeValidator(0)    
+    , fDatatypeValidator(0)
     , fNamespaceList(0)
     , fBaseAttDecl(0)
 {
@@ -59,9 +59,9 @@
                           , const XMLAttDef::DefAttTypes defType
                           , MemoryManager* const         manager) :
     XMLAttDef(type, defType, manager)
-    , fElemId(XMLElementDecl::fgInvalidElemId)  
+    , fElemId(XMLElementDecl::fgInvalidElemId)
     , fPSVIScope(PSVIDefs::SCP_ABSENT)
-    , fDatatypeValidator(0)      
+    , fDatatypeValidator(0)
     , fNamespaceList(0)
     , fBaseAttDecl(0)
 {
@@ -78,9 +78,9 @@
                           , MemoryManager* const         manager) :
 
     XMLAttDef(attValue, type, defType, enumValues, manager)
-    , fElemId(XMLElementDecl::fgInvalidElemId) 
+    , fElemId(XMLElementDecl::fgInvalidElemId)
     , fPSVIScope(PSVIDefs::SCP_ABSENT)
-    , fDatatypeValidator(0)        
+    , fDatatypeValidator(0)
     , fNamespaceList(0)
     , fBaseAttDecl(0)
 {
@@ -95,7 +95,7 @@
     , fElemId(XMLElementDecl::fgInvalidElemId)
     , fPSVIScope(other->fPSVIScope)
     , fAttName(0)
-    , fDatatypeValidator(other->fDatatypeValidator)       
+    , fDatatypeValidator(other->fDatatypeValidator)
     , fNamespaceList(0)
     , fBaseAttDecl(other->fBaseAttDecl)
 {
@@ -139,12 +139,12 @@
 
     if (serEng.isStoring())
     {
-        serEng<<fElemId;
+        serEng.writeSize (fElemId);
         serEng<<(int)fPSVIScope;
 
         serEng<<fAttName;
 
-        DatatypeValidator::storeDV(serEng, fDatatypeValidator);                
+        DatatypeValidator::storeDV(serEng, fDatatypeValidator);
 
         /***
          * Serialize ValueVectorOf<unsigned int>
@@ -156,20 +156,20 @@
     else
     {
 
-        serEng>>fElemId;
-        int i;        
+        serEng.readSize (fElemId);
+        int i;
         serEng>>i;
         fPSVIScope = (PSVIDefs::PSVIScope)i;
 
         serEng>>fAttName;
 
-        fDatatypeValidator    = DatatypeValidator::loadDV(serEng);             
  
+        fDatatypeValidator    = DatatypeValidator::loadDV(serEng);
 
         /***
          * Deserialize ValueVectorOf<unsigned int>
          ***/
         XTemplateSerializer::loadObject(&fNamespaceList, 8, false, serEng);
-       
+
         serEng>>fBaseAttDecl;
     }
 }

Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp
URL: 
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp?rev=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp Thu Jul 
24 04:15:19 2008
@@ -155,7 +155,7 @@
          *
          ***/
         XTemplateSerializer::storeObject(fList, serEng);
-        serEng << fCount;
+        serEng.writeSize (fCount);
 
         // do not serialize fEnum
     }
@@ -169,7 +169,7 @@
         XTemplateSerializer::loadObject(&fList, 29, true, serEng);
 
         // assume empty so we can size fArray just right
-        serEng >> fSize;
+        serEng.readSize (fSize);
         if (!fEnum && fList)
         {
             fEnum = new (getMemoryManager()) 
RefHash2KeysTableOfEnumerator<SchemaAttDef>(fList, false, getMemoryManager());

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=679359&r1=679358&r2=679359&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaValidator.cpp Thu Jul 24 
04:15:19 2008
@@ -2030,11 +2030,11 @@
     // check Occurrence ranges
     XMLSize_t derivedCount = derivedNodes->size();
     XMLSize_t baseCount = baseNodes->size();
-    int derivedMin = derivedSpecNode->getMinOccurs() * derivedCount;
+    int derivedMin = derivedSpecNode->getMinOccurs() * (unsigned 
int)derivedCount;
     int derivedMax = derivedSpecNode->getMaxOccurs();
 
     if (derivedMax != SchemaSymbols::XSD_UNBOUNDED) {
-        derivedMax *= derivedCount;
+        derivedMax *= (unsigned int)derivedCount;
     }
 
     if (!isOccurrenceRangeOK(derivedMin, derivedMax, 
baseSpecNode->getMinOccurs(),



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to