From a80390750dd94db7f2bc42521ba41705ac063fdf Mon Sep 17 00:00:00 2001
From: PeiYong Zhang <peiyongz@apache.org>
Date: Thu, 13 Nov 2003 23:21:41 +0000
Subject: [PATCH] initSize
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@175385 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/validators/DTD/DTDAttDefList.cpp | 5 ++++-
src/xercesc/validators/DTD/DTDElementDecl.cpp | 2 +-
src/xercesc/validators/datatype/DatatypeValidator.cpp | 6 +++++-
src/xercesc/validators/datatype/UnionDatatypeValidator.cpp | 5 ++++-
src/xercesc/validators/schema/ComplexTypeInfo.cpp | 5 ++++-
src/xercesc/validators/schema/SchemaAttDefList.cpp | 5 ++++-
src/xercesc/validators/schema/SchemaElementDecl.cpp | 7 +++++--
src/xercesc/validators/schema/XercesAttGroupInfo.cpp | 7 +++++--
src/xercesc/validators/schema/XercesGroupInfo.cpp | 5 ++++-
.../validators/schema/identity/IdentityConstraint.cpp | 5 ++++-
10 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/src/xercesc/validators/DTD/DTDAttDefList.cpp b/src/xercesc/validators/DTD/DTDAttDefList.cpp
index 0dd5d966b..7ec2fcbd2 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 0ad25174c..7ce957054 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 1bccd4ee8..fec1b1d4b 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 6a05e8fe3..4883ff431 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 147ce2c0f..c99564dc5 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 5ccf31506..c1773abee 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 9411ba0b5..fdea24ead 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 56926e6f6..dbf530a09 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 43628f158..91302d21e 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 2efbd1d46..5defe271f 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);
}
--
GitLab