From a7bf34428c938e470d200518db02540c6cfa7148 Mon Sep 17 00:00:00 2001 From: Alberto Massari <amassari@apache.org> Date: Tue, 28 Dec 2004 16:35:57 +0000 Subject: [PATCH] Store fAxisType as an integer, not as a XMLCh (bug# 1177) git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@176256 13f79535-47bb-0310-9956-ffa450edef68 --- src/xercesc/util/XercesVersion.hpp | 2 +- src/xercesc/validators/schema/identity/XercesXPath.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp index 6be40b2d1..b921afa8a 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 4 +#define XERCES_GRAMMAR_SERIALIZATION_LEVEL 5 /** DO NOT MODIFY BELOW THIS LINE */ diff --git a/src/xercesc/validators/schema/identity/XercesXPath.cpp b/src/xercesc/validators/schema/identity/XercesXPath.cpp index 5132730a7..2f219f04e 100644 --- a/src/xercesc/validators/schema/identity/XercesXPath.cpp +++ b/src/xercesc/validators/schema/identity/XercesXPath.cpp @@ -16,6 +16,9 @@ /* * $Log$ + * Revision 1.15 2004/12/28 16:35:57 amassari + * Store fAxisType as an integer, not as a XMLCh (bug# 1177) + * * Revision 1.14 2004/09/08 13:56:59 peiyongz * Apache License Version 2.0 * @@ -254,12 +257,15 @@ void XercesStep::serialize(XSerializeEngine& serEng) { if (serEng.isStoring()) { - serEng<<fAxisType; + serEng<<(int)fAxisType; serEng<<fNodeTest; } else { - serEng>>fAxisType; + int i; + serEng>>i; + fAxisType = (unsigned short) i; + serEng>>fNodeTest; } } -- GitLab