peiyongz 2003/10/08 14:33:48
Modified: c/src/xercesc/validators/schema ComplexTypeInfo.cpp
ComplexTypeInfo.hpp
Log:
Synchronize ContentSpec/ContentModel/FormattedModel
Revision Changes Path
1.11 +5 -6 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ComplexTypeInfo.cpp 26 Sep 2003 18:31:05 -0000 1.10
+++ ComplexTypeInfo.cpp 8 Oct 2003 21:33:48 -0000 1.11
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2003/10/08 21:33:48 peiyongz
+ * Synchronize ContentSpec/ContentModel/FormattedModel
+ *
* Revision 1.10 2003/09/26 18:31:05 peiyongz
* Synchronize ContentSpecNode and formattedModel
*
@@ -270,12 +273,8 @@
fContentSpec = toAdopt;
- // reset formattedModel
- if (fFormattedModel)
- {
- fMemoryManager->deallocate(fFormattedModel);
- fFormattedModel = 0;
- }
+ //reset Content Model
+ setContentModel(0);
}
void ComplexTypeInfo::setLocator(XSDLocator* const aLocator) {
1.15 +8 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ComplexTypeInfo.hpp 18 May 2003 14:02:07 -0000 1.14
+++ ComplexTypeInfo.hpp 8 Oct 2003 21:33:48 -0000 1.15
@@ -536,6 +536,13 @@
{
delete fContentModel;
fContentModel = newModelToAdopt;
+
+ // reset formattedModel
+ if (fFormattedModel)
+ {
+ fMemoryManager->deallocate(fFormattedModel);
+ fFormattedModel = 0;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
