cargilld 2004/09/22 17:37:24
Modified: c/src/xercesc/internal XObjectComparator.cpp
c/src/xercesc/validators/schema ComplexTypeInfo.cpp
ComplexTypeInfo.hpp
Log:
Remove unused variable and data member.
Revision Changes Path
1.8 +5 -3 xml-xerces/c/src/xercesc/internal/XObjectComparator.cpp
Index: XObjectComparator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XObjectComparator.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XObjectComparator.cpp 8 Sep 2004 13:56:14 -0000 1.7
+++ XObjectComparator.cpp 23 Sep 2004 00:37:24 -0000 1.8
@@ -17,6 +17,9 @@
/*
*
* $Log$
+ * Revision 1.8 2004/09/23 00:37:24 cargilld
+ * Remove unused variable and data member.
+ *
* Revision 1.7 2004/09/08 13:56:14 peiyongz
* Apache License Version 2.0
*
@@ -525,8 +528,7 @@
/***
don't compare
XMLContentModel* fContentModel;
- XMLCh* fFormattedModel;
- RefVectorOf<ContentSpecNode>* fSpecNodesToDelete;
+ XMLCh* fFormattedModel;
XSDLocator* fLocator;
*
* fContentSpecOrgURI: start of the array
1.30 +9 -11 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp
Index: ComplexTypeInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ComplexTypeInfo.cpp 16 Sep 2004 13:32:04 -0000 1.29
+++ ComplexTypeInfo.cpp 23 Sep 2004 00:37:24 -0000 1.30
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.30 2004/09/23 00:37:24 cargilld
+ * Remove unused variable and data member.
+ *
* Revision 1.29 2004/09/16 13:32:04 amassari
* Updated error message for UPA to also state the complex type that is failing the
test
*
@@ -336,8 +339,7 @@
, fContentSpec(0)
, fAttWildCard(0)
, fAttList(0)
- , fElements(0)
- , fSpecNodesToDelete(0)
+ , fElements(0)
, fAttDefs(0)
, fContentModel(0)
, fFormattedModel(0)
@@ -364,8 +366,7 @@
delete fAttWildCard;
delete fAttDefs;
delete fAttList;
- delete fElements;
- //delete fSpecNodesToDelete;
+ delete fElements;
delete fLocator;
delete fContentModel;
@@ -576,7 +577,7 @@
return newValue;
}
-XMLContentModel* ComplexTypeInfo::makeContentModel(const bool checkUPA,
ContentSpecNode* const specNode)
+XMLContentModel* ComplexTypeInfo::makeContentModel(const bool checkUPA)
{
ContentSpecNode* aSpecNode = new (fMemoryManager)
ContentSpecNode(*fContentSpec);
XMLContentModel* retModel = 0;
@@ -1057,8 +1058,7 @@
*
* fContentModel;
* fFormattedModel;
- * fLocator;
- * fSpecNodesToDelete
+ * fLocator;
*
* fContentSpecOrgURI: start of the array
* fContentSpecOrgURISize: size of the array
@@ -1103,8 +1103,7 @@
* Don't deserialize
*
* fFormattedModel;
- * fLocator;
- * fSpecNodesToDelete
+ * fLocator;
*
* fContentSpecOrgURI: start of the array
* fContentSpecOrgURISize: size of the array
@@ -1112,8 +1111,7 @@
***/
fFormattedModel = 0;
- fLocator = 0;
- fSpecNodesToDelete = 0;
+ fLocator = 0;
fContentSpecOrgURI = 0;
fContentSpecOrgURISize = 0;
fUniqueURI = 0;
1.23 +3 -4 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.hpp
Index: ComplexTypeInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ComplexTypeInfo.hpp 8 Sep 2004 13:56:56 -0000 1.22
+++ ComplexTypeInfo.hpp 23 Sep 2004 00:37:24 -0000 1.23
@@ -184,7 +184,7 @@
// -----------------------------------------------------------------------
void faultInAttDefList() const;
XMLContentModel* createChildModel(ContentSpecNode* specNode, const bool
isMixed);
- XMLContentModel* makeContentModel(const bool checkUPA = false, ContentSpecNode*
const specNode = 0);
+ XMLContentModel* makeContentModel(const bool checkUPA = false);
XMLContentModel* buildContentModel(ContentSpecNode* const specNode);
XMLCh* formatContentModel () const ;
ContentSpecNode* expandContentModel(ContentSpecNode* const curNode, const int
minOccurs, const int maxOccurs);
@@ -214,8 +214,7 @@
ContentSpecNode* fContentSpec;
SchemaAttDef* fAttWildCard;
SchemaAttDefList* fAttList;
- RefVectorOf<SchemaElementDecl>* fElements;
- RefVectorOf<ContentSpecNode>* fSpecNodesToDelete;
+ RefVectorOf<SchemaElementDecl>* fElements;
RefHash2KeysTableOf<SchemaAttDef>* fAttDefs;
XMLContentModel* fContentModel;
XMLCh* fFormattedModel;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
