You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2004/12/28 17:35:57 UTC

cvs commit: xml-xerces/c/src/xercesc/validators/schema/identity XercesXPath.cpp

amassari    2004/12/28 08:35:57

  Modified:    c/src/xercesc/util XercesVersion.hpp
               c/src/xercesc/validators/schema/identity XercesXPath.cpp
  Log:
  Store fAxisType as an integer, not as a XMLCh (bug# 1177)
  
  Revision  Changes    Path
  1.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- XercesVersion.hpp	13 Oct 2004 17:55:40 -0000	1.15
  +++ XercesVersion.hpp	28 Dec 2004 16:35:57 -0000	1.16
  @@ -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 */
   
  
  
  
  1.15      +8 -2      xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.cpp
  
  Index: XercesXPath.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XercesXPath.cpp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XercesXPath.cpp	8 Sep 2004 13:56:59 -0000	1.14
  +++ XercesXPath.cpp	28 Dec 2004 16:35:57 -0000	1.15
  @@ -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 @@
   {
       if (serEng.isStoring())
       {
  -        serEng<<fAxisType;
  +        serEng<<(int)fAxisType;
           serEng<<fNodeTest;
       }
       else
       {
  -        serEng>>fAxisType;
  +        int i;
  +        serEng>>i;
  +        fAxisType = (unsigned short) i;
  +
           serEng>>fNodeTest;
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org