peiyongz 2004/10/28 13:18:26
Modified: c/src/xercesc/validators/DTD DTDGrammar.hpp DTDGrammar.cpp
DTDElementDecl.hpp DTDElementDecl.cpp
Log:
Data member reshuffle
Revision Changes Path
1.17 +5 -1 xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.hpp
Index: DTDGrammar.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DTDGrammar.hpp 20 Oct 2004 15:19:07 -0000 1.16
+++ DTDGrammar.hpp 28 Oct 2004 20:18:26 -0000 1.17
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.17 2004/10/28 20:18:26 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.16 2004/10/20 15:19:07 knoaman
* Allow option of initializing static data in XMLPlatformUtils::Initialize
*
@@ -298,9 +301,10 @@
NameIdPool<DTDElementDecl>* fElemNonDeclPool;
NameIdPool<DTDEntityDecl>* fEntityDeclPool;
NameIdPool<XMLNotationDecl>* fNotationDeclPool;
+ XMLDTDDescription* fGramDesc;
+
unsigned int fRootElemId;
bool fValidated;
- XMLDTDDescription* fGramDesc;
friend class XMLInitializer;
};
1.22 +10 -7 xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.cpp
Index: DTDGrammar.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDGrammar.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DTDGrammar.cpp 20 Oct 2004 15:19:07 -0000 1.21
+++ DTDGrammar.cpp 28 Oct 2004 20:18:26 -0000 1.22
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.22 2004/10/28 20:18:26 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.21 2004/10/20 15:19:07 knoaman
* Allow option of initializing static data in XMLPlatformUtils::Initialize
*
@@ -153,9 +156,9 @@
, fElemNonDeclPool(0)
, fEntityDeclPool(0)
, fNotationDeclPool(0)
+ , fGramDesc(0)
, fRootElemId(0)
, fValidated(false)
- , fGramDesc(0)
{
//
// Init all the pool members.
@@ -367,14 +370,14 @@
XTemplateSerializer::storeObject(fEntityDeclPool, serEng);
XTemplateSerializer::storeObject(fNotationDeclPool, serEng);
- serEng<<fRootElemId;
- serEng<<fValidated;
-
/***
* serialize() method shall be used to store object
* which has been created in ctor
***/
fGramDesc->serialize(serEng);
+
+ serEng<<fRootElemId;
+ serEng<<fValidated;
}
else
{
@@ -390,14 +393,14 @@
XTemplateSerializer::loadObject(&fEntityDeclPool, 109, 128, serEng);
XTemplateSerializer::loadObject(&fNotationDeclPool, 109, 128, serEng);
- serEng>>fRootElemId;
- serEng>>fValidated;
-
/***
* serialize() method shall be used to load object
* which has been created in ctor
***/
fGramDesc->serialize(serEng);
+
+ serEng>>fRootElemId;
+ serEng>>fValidated;
}
}
1.12 +5 -1 xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.hpp
Index: DTDElementDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DTDElementDecl.hpp 20 Sep 2004 14:47:13 -0000 1.11
+++ DTDElementDecl.hpp 28 Oct 2004 20:18:26 -0000 1.12
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.12 2004/10/28 20:18:26 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.11 2004/09/20 14:47:13 amassari
* Mark some methods as deprecated
*
@@ -266,10 +269,11 @@
// our content model as a string, we format it and fault it into
// this field (to avoid doing the formatted over and over.)
// -----------------------------------------------------------------------
+ ModelTypes fModelType;
+
RefHashTableOf<DTDAttDef>* fAttDefs;
DTDAttDefList* fAttList;
ContentSpecNode* fContentSpec;
- ModelTypes fModelType;
XMLContentModel* fContentModel;
XMLCh* fFormattedModel;
};
1.18 +10 -9 xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.cpp
Index: DTDElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDElementDecl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DTDElementDecl.cpp 8 Sep 2004 13:56:50 -0000 1.17
+++ DTDElementDecl.cpp 28 Oct 2004 20:18:26 -0000 1.18
@@ -43,10 +43,10 @@
DTDElementDecl::DTDElementDecl(MemoryManager* const manager) :
XMLElementDecl(manager)
+ , fModelType(Any)
, fAttDefs(0)
, fAttList(0)
, fContentSpec(0)
- , fModelType(Any)
, fContentModel(0)
, fFormattedModel(0)
{
@@ -57,10 +57,10 @@
, const DTDElementDecl::ModelTypes type
, MemoryManager* const manager) :
XMLElementDecl(manager)
+ , fModelType(type)
, fAttDefs(0)
, fAttList(0)
, fContentSpec(0)
- , fModelType(type)
, fContentModel(0)
, fFormattedModel(0)
{
@@ -71,10 +71,10 @@
, const DTDElementDecl::ModelTypes type
, MemoryManager* const manager) :
XMLElementDecl(manager)
+ , fModelType(type)
, fAttDefs(0)
, fAttList(0)
, fContentSpec(0)
- , fModelType(type)
, fContentModel(0)
, fFormattedModel(0)
{
@@ -443,6 +443,8 @@
if (serEng.isStoring())
{
+ serEng<<(int) fModelType;
+
/***
*
* Serialize RefHashTableOf<DTDAttDef>
@@ -452,7 +454,6 @@
serEng<<fAttList;
serEng<<fContentSpec;
- serEng<<(int) fModelType;
/***
* don't serialize
@@ -465,6 +466,10 @@
}
else
{
+ int i;
+ serEng>>i;
+ fModelType=(ModelTypes)i;
+
/***
*
* Deserialize RefHashTableOf<DTDAttDef>
@@ -474,10 +479,6 @@
serEng>>fAttList;
serEng>>fContentSpec;
-
- int i;
- serEng>>i;
- fModelType=(ModelTypes)i;
/***
* don't deserialize
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
