cargilld 2004/10/13 10:55:40
Modified: c/src/xercesc/util XercesVersion.hpp
c/src/xercesc/validators/schema SchemaAttDef.cpp
SchemaElementDecl.cpp
Log:
Serialization fix, fPVSIScope not serialized. Problem reported by David Bertoni.
Revision Changes Path
1.15 +1 -1 xml-xerces/c/src/xercesc/util/XercesVersion.hpp
Index: XercesVersion.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XercesVersion.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XercesVersion.hpp 30 Sep 2004 18:52:27 -0000 1.14
+++ XercesVersion.hpp 13 Oct 2004 17:55:40 -0000 1.15
@@ -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 */
1.15 +8 -1 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.cpp
Index: SchemaAttDef.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SchemaAttDef.cpp 8 Sep 2004 13:56:56 -0000 1.14
+++ SchemaAttDef.cpp 13 Oct 2004 17:55:40 -0000 1.15
@@ -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 @@
serEng<<(int)fValidity;
serEng<<(int)fValidation;
+ serEng<<(int)fPSVIScope;
serEng<<fBaseAttDecl;
}
else
@@ -245,7 +249,10 @@
serEng>>i;
fValidation = (PSVIDefs::Validation)i;
-
+
+ serEng>>i;
+ fPSVIScope = (PSVIDefs::PSVIScope)i;
+
serEng>>fBaseAttDecl;
}
}
1.21 +6 -2 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp
Index: SchemaElementDecl.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SchemaElementDecl.cpp 8 Sep 2004 13:56:56 -0000 1.20
+++ SchemaElementDecl.cpp 13 Oct 2004 17:55:40 -0000 1.21
@@ -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 @@
if (serEng.isStoring())
{
serEng<<(int)fModelType;
-
+ serEng<<(int)fPSVIScope;
DatatypeValidator::storeDV(serEng, fDatatypeValidator);
serEng<<fEnclosingScope;
@@ -454,7 +457,8 @@
int i;
serEng>>i;
fModelType = (ModelTypes)i;
-
+ serEng>>i;
+ fPSVIScope = (PSVIDefs::PSVIScope)i;
fDatatypeValidator = DatatypeValidator::loadDV(serEng);
serEng>>fEnclosingScope;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
