diff --git a/src/xercesc/validators/DTD/DTDAttDefList.cpp b/src/xercesc/validators/DTD/DTDAttDefList.cpp index 0dd5d966bba3e87feeab587ada53f0978e05ebff..7ec2fcbd22a31fd39f89a4d70d654f1e144aaa9a 100644 --- a/src/xercesc/validators/DTD/DTDAttDefList.cpp +++ b/src/xercesc/validators/DTD/DTDAttDefList.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.7 2003/11/13 23:19:49 peiyongz + * initSize + * * Revision 1.6 2003/11/10 21:54:51 neilg * implementation for new stateless means of traversing attribute definition lists * @@ -241,7 +244,7 @@ void DTDAttDefList::serialize(XSerializeEngine& serEng) * Deserialize RefHashTableOf<DTDAttDef> * ***/ - XTemplateSerializer::loadObject(&fList, 3, true, serEng); + XTemplateSerializer::loadObject(&fList, 29, true, serEng); // assume empty so we can size fArray just right serEng >> fSize; if (!fEnum && fList) diff --git a/src/xercesc/validators/DTD/DTDElementDecl.cpp b/src/xercesc/validators/DTD/DTDElementDecl.cpp index 0ad25174c94ff00837f0bbaeb0040ca7009038fa..7ce95705497957ca41d3f58e5276af3c8b3aa387 100644 --- a/src/xercesc/validators/DTD/DTDElementDecl.cpp +++ b/src/xercesc/validators/DTD/DTDElementDecl.cpp @@ -510,7 +510,7 @@ void DTDElementDecl::serialize(XSerializeEngine& serEng) * Deserialize RefHashTableOf<DTDAttDef> * ***/ - XTemplateSerializer::loadObject(&fAttDefs, 3, true, serEng); + XTemplateSerializer::loadObject(&fAttDefs, 29, true, serEng); serEng>>fAttList; serEng>>fContentSpec; diff --git a/src/xercesc/validators/datatype/DatatypeValidator.cpp b/src/xercesc/validators/datatype/DatatypeValidator.cpp index 1bccd4ee8eb0b943a64d521410b2a871588aba22..fec1b1d4b0ef9888c5aa83740c5b1a0f9ea86485 100644 --- a/src/xercesc/validators/datatype/DatatypeValidator.cpp +++ b/src/xercesc/validators/datatype/DatatypeValidator.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.17 2003/11/13 23:19:18 peiyongz + * initSize + * * Revision 1.16 2003/11/07 22:39:41 peiyongz * PSVI/schema component model implementation, thanks to David Cargill * @@ -304,6 +307,7 @@ void DatatypeValidator::cleanUp() { fMemoryManager->deallocate(fPattern);//delete [] fPattern; if (fTypeName) fMemoryManager->deallocate(fTypeName); + } /*** @@ -410,7 +414,7 @@ void DatatypeValidator::serialize(XSerializeEngine& serEng) * Deserialize RefHashTableOf<KVStringPair> * ***/ - XTemplateSerializer::loadObject(&fFacets, 3, true, serEng); + XTemplateSerializer::loadObject(&fFacets, 29, true, serEng); serEng.readString(fPattern); diff --git a/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp b/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp index 6a05e8fe32994453ac9d0980e13ca67b199db3cc..4883ff4314455fc3feaf9ccc4f8649f22babb68c 100644 --- a/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp +++ b/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp @@ -57,6 +57,9 @@ /* * $Id$ * $Log$ + * Revision 1.17 2003/11/13 23:19:18 peiyongz + * initSize + * * Revision 1.16 2003/11/12 20:32:03 peiyongz * Statless Grammar: ValidationContext * @@ -500,7 +503,7 @@ void UnionDatatypeValidator::serialize(XSerializeEngine& serEng) XTemplateSerializer::loadObject(&fEnumeration, 8, owned, serEng); owned = fMemberTypesInherited ? true : false; - XTemplateSerializer::loadObject(&fMemberTypeValidators, 8, owned, serEng); + XTemplateSerializer::loadObject(&fMemberTypeValidators, 4, owned, serEng); fValidatedDatatype = DatatypeValidator::loadDV(serEng); diff --git a/src/xercesc/validators/schema/ComplexTypeInfo.cpp b/src/xercesc/validators/schema/ComplexTypeInfo.cpp index 147ce2c0fb9cc3a3cec9c02ea8d52b6a64dbee7e..c99564dc58291335a92df8a95fa35fc3b0d2f2f5 100644 --- a/src/xercesc/validators/schema/ComplexTypeInfo.cpp +++ b/src/xercesc/validators/schema/ComplexTypeInfo.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.19 2003/11/13 23:20:47 peiyongz + * initSize + * * Revision 1.18 2003/11/10 21:54:51 neilg * implementation for new stateless means of traversing attribute definition lists * @@ -1030,7 +1033,7 @@ void ComplexTypeInfo::serialize(XSerializeEngine& serEng) * Deserialize RefHash2KeysTableOf<SchemaAttDef>* fAttDefs; ***/ XTemplateSerializer::loadObject(&fElements, 8, false, serEng); - XTemplateSerializer::loadObject(&fAttDefs, 8, true, serEng); + XTemplateSerializer::loadObject(&fAttDefs, 29, true, serEng); /*** * Don't deserialize diff --git a/src/xercesc/validators/schema/SchemaAttDefList.cpp b/src/xercesc/validators/schema/SchemaAttDefList.cpp index 5ccf315063fc001e4a404ba0c3e123bfd2b4620a..c1773abeeae17d67b97872378ab422fe11ea3146 100644 --- a/src/xercesc/validators/schema/SchemaAttDefList.cpp +++ b/src/xercesc/validators/schema/SchemaAttDefList.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.8 2003/11/13 23:20:47 peiyongz + * initSize + * * Revision 1.7 2003/11/10 21:54:51 neilg * implementation for new stateless means of traversing attribute definition lists * @@ -239,7 +242,7 @@ void SchemaAttDefList::serialize(XSerializeEngine& serEng) * Deserialize RefHash2KeysTableOf<SchemaAttDef> * ***/ - XTemplateSerializer::loadObject(&fList, 3, true, serEng); + XTemplateSerializer::loadObject(&fList, 29, true, serEng); // assume empty so we can size fArray just right serEng >> fSize; diff --git a/src/xercesc/validators/schema/SchemaElementDecl.cpp b/src/xercesc/validators/schema/SchemaElementDecl.cpp index 9411ba0b57b459cca67e9b46ba8d0371376263fd..fdea24ead626d2b4548dba29000d69bdb20e0835 100644 --- a/src/xercesc/validators/schema/SchemaElementDecl.cpp +++ b/src/xercesc/validators/schema/SchemaElementDecl.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.15 2003/11/13 23:20:47 peiyongz + * initSize + * * Revision 1.14 2003/10/17 21:17:12 peiyongz * using XTemplateSerializer * @@ -488,7 +491,7 @@ void SchemaElementDecl::serialize(XSerializeEngine& serEng) /*** * DeSerialize RefHash2KeysTableOf<SchemaAttDef>* fAttDefs; ***/ - XTemplateSerializer::loadObject(&fAttDefs, 3, true, serEng); + XTemplateSerializer::loadObject(&fAttDefs, 29, true, serEng); serEng>>fXsiComplexTypeInfo; @@ -497,7 +500,7 @@ void SchemaElementDecl::serialize(XSerializeEngine& serEng) /*** * DeSerialize RefVectorOf<IdentityConstraint>* fIdentityConstraints; ***/ - XTemplateSerializer::loadObject(&fIdentityConstraints, 8, true, serEng); + XTemplateSerializer::loadObject(&fIdentityConstraints, 16, true, serEng); serEng>>fAttWildCard; serEng>>fSubstitutionGroupElem; diff --git a/src/xercesc/validators/schema/XercesAttGroupInfo.cpp b/src/xercesc/validators/schema/XercesAttGroupInfo.cpp index 56926e6f697ce2b7057b760d1c76d073ede87252..dbf530a098555274c3aa186d848f7d866546a081 100644 --- a/src/xercesc/validators/schema/XercesAttGroupInfo.cpp +++ b/src/xercesc/validators/schema/XercesAttGroupInfo.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.7 2003/11/13 23:20:47 peiyongz + * initSize + * * Revision 1.6 2003/10/17 21:17:12 peiyongz * using XTemplateSerializer * @@ -208,7 +211,7 @@ void XercesAttGroupInfo::serialize(XSerializeEngine& serEng) * Deserialize RefVectorOf<SchemaAttDef>* fAttributes; * ***/ - XTemplateSerializer::loadObject(&fAttributes, 8, true, serEng); + XTemplateSerializer::loadObject(&fAttributes, 4, true, serEng); /*** * @@ -216,7 +219,7 @@ void XercesAttGroupInfo::serialize(XSerializeEngine& serEng) * ***/ - XTemplateSerializer::loadObject(&fAnyAttributes, 8, true, serEng); + XTemplateSerializer::loadObject(&fAnyAttributes, 2, true, serEng); serEng>>fCompleteWildCard; } diff --git a/src/xercesc/validators/schema/XercesGroupInfo.cpp b/src/xercesc/validators/schema/XercesGroupInfo.cpp index 43628f158734fd196c75489ed592439d9acda9a2..91302d21e0255f1896ad71de801db1fc34cc6c8d 100644 --- a/src/xercesc/validators/schema/XercesGroupInfo.cpp +++ b/src/xercesc/validators/schema/XercesGroupInfo.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.10 2003/11/13 23:20:47 peiyongz + * initSize + * * Revision 1.9 2003/10/29 16:21:52 peiyongz * don't own the element list pointed to by fElements * @@ -174,7 +177,7 @@ void XercesGroupInfo::serialize(XSerializeEngine& serEng) * Deserialize RefVectorOf<SchemaElementDecl>* fElements; * ***/ - XTemplateSerializer::loadObject(&fElements, 8, false, serEng); + XTemplateSerializer::loadObject(&fElements, 4, false, serEng); serEng>>fBaseGroup; diff --git a/src/xercesc/validators/schema/identity/IdentityConstraint.cpp b/src/xercesc/validators/schema/identity/IdentityConstraint.cpp index 2efbd1d46890a40a77fcafeeef4a1a9aeda0ac9c..5defe271f23b3437317a8b1c63332f6a68f633f6 100644 --- a/src/xercesc/validators/schema/identity/IdentityConstraint.cpp +++ b/src/xercesc/validators/schema/identity/IdentityConstraint.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.8 2003/11/13 23:21:41 peiyongz + * initSize + * * Revision 1.7 2003/10/17 21:18:04 peiyongz * using XTemplateSerializer * @@ -231,7 +234,7 @@ void IdentityConstraint::serialize(XSerializeEngine& serEng) * Deserialize RefVectorOf<IC_Field>* fFields; * ***/ - XTemplateSerializer::loadObject(&fFields, 8, true, serEng); + XTemplateSerializer::loadObject(&fFields, 4, true, serEng); }