diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp index b333ac7fba8f2312b4374fd8e8c72bb41f3a2a1e..6be40b2d1e8691aa8a6e0857e7049c482a566eb8 100644 --- a/src/xercesc/util/XercesVersion.hpp +++ b/src/xercesc/util/XercesVersion.hpp @@ -128,7 +128,7 @@ /*** * data member added to XSAnnotation ***/ -#define XERCES_GRAMMAR_SERIALIZATION_LEVEL 3 +#define XERCES_GRAMMAR_SERIALIZATION_LEVEL 4 /** DO NOT MODIFY BELOW THIS LINE */ diff --git a/src/xercesc/validators/schema/SchemaAttDef.cpp b/src/xercesc/validators/schema/SchemaAttDef.cpp index 8b566c51d0a117026867b92bb09f9d2e6c304f84..3300e8ba3d8fdd493240e02caef8c8af4ce9dda2 100644 --- a/src/xercesc/validators/schema/SchemaAttDef.cpp +++ b/src/xercesc/validators/schema/SchemaAttDef.cpp @@ -16,6 +16,9 @@ /* * $Log$ + * Revision 1.15 2004/10/13 17:55:40 cargilld + * Serialization fix, fPVSIScope not serialized. Problem reported by David Bertoni. + * * Revision 1.14 2004/09/08 13:56:56 peiyongz * Apache License Version 2.0 * @@ -223,6 +226,7 @@ void SchemaAttDef::serialize(XSerializeEngine& serEng) serEng<<(int)fValidity; serEng<<(int)fValidation; + serEng<<(int)fPSVIScope; serEng<<fBaseAttDecl; } else @@ -245,7 +249,10 @@ void SchemaAttDef::serialize(XSerializeEngine& serEng) serEng>>i; fValidation = (PSVIDefs::Validation)i; - + + serEng>>i; + fPSVIScope = (PSVIDefs::PSVIScope)i; + serEng>>fBaseAttDecl; } } diff --git a/src/xercesc/validators/schema/SchemaElementDecl.cpp b/src/xercesc/validators/schema/SchemaElementDecl.cpp index d5713178fece364f57d61e550c931ee4f9b77e8d..96fec1dee2ee304541ea1513600221ba474f2cbc 100644 --- a/src/xercesc/validators/schema/SchemaElementDecl.cpp +++ b/src/xercesc/validators/schema/SchemaElementDecl.cpp @@ -16,6 +16,9 @@ /* * $Log$ + * Revision 1.21 2004/10/13 17:55:40 cargilld + * Serialization fix, fPVSIScope not serialized. Problem reported by David Bertoni. + * * Revision 1.20 2004/09/08 13:56:56 peiyongz * Apache License Version 2.0 * @@ -413,7 +416,7 @@ void SchemaElementDecl::serialize(XSerializeEngine& serEng) if (serEng.isStoring()) { serEng<<(int)fModelType; - + serEng<<(int)fPSVIScope; DatatypeValidator::storeDV(serEng, fDatatypeValidator); serEng<<fEnclosingScope; @@ -454,7 +457,8 @@ void SchemaElementDecl::serialize(XSerializeEngine& serEng) int i; serEng>>i; fModelType = (ModelTypes)i; - + serEng>>i; + fPSVIScope = (PSVIDefs::PSVIScope)i; fDatatypeValidator = DatatypeValidator::loadDV(serEng); serEng>>fEnclosingScope;