peiyongz 2003/10/08 14:33:18
Modified: c/src/xercesc/validators/DTD DTDElementDecl.cpp
DTDElementDecl.hpp
Log:
Synchronize ContentSpec/ContentModel/FormattedModel
Revision Changes Path
1.7 +3 -7 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DTDElementDecl.cpp 26 Sep 2003 18:31:13 -0000 1.6
+++ DTDElementDecl.cpp 8 Oct 2003 21:33:18 -0000 1.7
@@ -245,12 +245,8 @@
delete fContentSpec;
fContentSpec = toAdopt;
- // reset formattedModel
- if (fFormattedModel)
- {
- getMemoryManager()->deallocate(fFormattedModel);
- fFormattedModel = 0;
- }
+ //reset Content Model
+ setContentModel(0);
}
1.6 +10 -0 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DTDElementDecl.hpp 16 May 2003 21:43:19 -0000 1.5
+++ DTDElementDecl.hpp 8 Oct 2003 21:33:18 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/10/08 21:33:18 peiyongz
+ * Synchronize ContentSpec/ContentModel/FormattedModel
+ *
* Revision 1.5 2003/05/16 21:43:19 knoaman
* Memory manager implementation: Modify constructors to pass in the memory manager.
*
@@ -304,6 +307,13 @@
{
delete fContentModel;
fContentModel = newModelToAdopt;
+
+ // reset formattedModel
+ if (fFormattedModel)
+ {
+ getMemoryManager()->deallocate(fFormattedModel);
+ fFormattedModel = 0;
+ }
}
// ---------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
