[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xerces-cvs
Subject:    cvs commit: xml-xerces/c/src/xercesc/util XMLUri.hpp XMLUri.cpp XMLDateTime.hpp XMLDateTime.cpp
From:       peiyongz () apache ! org
Date:       2004-10-28 20:13:35
Message-ID: 20041028201335.69383.qmail () minotaur ! apache ! org
[Download RAW message or body]

peiyongz    2004/10/28 13:13:35

  Modified:    c/src/xercesc/util XMLUri.hpp XMLUri.cpp XMLDateTime.hpp
                        XMLDateTime.cpp
  Log:
  Data member reshuffle
  
  Revision  Changes    Path
  1.19      +5 -2      xml-xerces/c/src/xercesc/util/XMLUri.hpp
  
  Index: XMLUri.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUri.hpp,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- XMLUri.hpp	8 Sep 2004 13:56:25 -0000	1.18
  +++ XMLUri.hpp	28 Oct 2004 20:13:35 -0000	1.19
  @@ -17,6 +17,9 @@
   /*
    * $Id$
    * $Log$
  + * Revision 1.19  2004/10/28 20:13:35  peiyongz
  + * Data member reshuffle
  + *
    * Revision 1.18  2004/09/08 13:56:25  peiyongz
    * Apache License Version 2.0
    *
  @@ -650,10 +653,10 @@
       //  the memory allocated.
       //
       // -----------------------------------------------------------------------
  +    int             fPort;
       XMLCh*          fScheme;
       XMLCh*          fUserInfo;
       XMLCh*          fHost;
  -    int             fPort;
       XMLCh*          fRegAuth;
       XMLCh*          fPath;
       XMLCh*          fQueryString;
  
  
  
  1.27      +11 -16    xml-xerces/c/src/xercesc/util/XMLUri.cpp
  
  Index: XMLUri.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUri.cpp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- XMLUri.cpp	8 Sep 2004 13:56:24 -0000	1.26
  +++ XMLUri.cpp	28 Oct 2004 20:13:35 -0000	1.27
  @@ -238,10 +238,10 @@
   // ctor# 2
   XMLUri::XMLUri(const XMLCh* const uriSpec,
                  MemoryManager* const manager)
  -: fScheme(0)
  +: fPort(-1)
  +, fScheme(0)
   , fUserInfo(0)
   , fHost(0)
  -, fPort(-1)
   , fRegAuth(0)
   , fPath(0)
   , fQueryString(0)
  @@ -267,10 +267,10 @@
   XMLUri::XMLUri(const XMLUri* const      baseURI
                 , const XMLCh* const   uriSpec
                 , MemoryManager* const manager)
  -: fScheme(0)
  +: fPort(-1)
  +, fScheme(0)
   , fUserInfo(0)
   , fHost(0)
  -, fPort(-1)
   , fRegAuth(0)
   , fPath(0)
   , fQueryString(0)
  @@ -294,10 +294,10 @@
   
   //Copy constructor
   XMLUri::XMLUri(const XMLUri& toCopy)
  -: fScheme(0)
  +: fPort(-1)
  +, fScheme(0)
   , fUserInfo(0)
   , fHost(0)
  -, fPort(-1)
   , fRegAuth(0)
   , fPath(0)
   , fQueryString(0)
  @@ -2546,13 +2546,10 @@
   
       if (serEng.isStoring())
       {
  -
  +        serEng<<fPort;
           serEng.writeString(fScheme);
           serEng.writeString(fUserInfo);
           serEng.writeString(fHost);
  -
  -        serEng<<fPort;
  -
           serEng.writeString(fRegAuth);
           serEng.writeString(fPath);
           serEng.writeString(fQueryString);
  @@ -2561,12 +2558,10 @@
       }
       else
       {
  +        serEng>>fPort;
           serEng.readString(fScheme);
           serEng.readString(fUserInfo);
           serEng.readString(fHost);
  -
  -        serEng>>fPort;
  -
           serEng.readString(fRegAuth);
           serEng.readString(fPath);
           serEng.readString(fQueryString);
  @@ -2577,10 +2572,10 @@
   }
   
   XMLUri::XMLUri(MemoryManager* const manager)
  -: fScheme(0)
  +: fPort(-1)
  +, fScheme(0)
   , fUserInfo(0)
   , fHost(0)
  -, fPort(-1)
   , fRegAuth(0)
   , fPath(0)
   , fQueryString(0)
  
  
  
  1.21      +5 -2      xml-xerces/c/src/xercesc/util/XMLDateTime.hpp
  
  Index: XMLDateTime.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLDateTime.hpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- XMLDateTime.hpp	8 Sep 2004 13:56:24 -0000	1.20
  +++ XMLDateTime.hpp	28 Oct 2004 20:13:35 -0000	1.21
  @@ -17,6 +17,9 @@
   /*
    * $Id$
    * $Log$
  + * Revision 1.21  2004/10/28 20:13:35  peiyongz
  + * Data member reshuffle
  + *
    * Revision 1.20  2004/09/08 13:56:24  peiyongz
    * Apache License Version 2.0
    *
  @@ -333,11 +336,11 @@
       int          fStart;
       int          fEnd;
       int          fBufferMaxLen;
  -    XMLCh*       fBuffer;
   
       double       fMiliSecond;
       bool         fHasTime;
   
  +    XMLCh*       fBuffer;
       MemoryManager* fMemoryManager;
   
       friend class XSValue;
  
  
  
  1.29      +6 -3      xml-xerces/c/src/xercesc/util/XMLDateTime.cpp
  
  Index: XMLDateTime.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLDateTime.cpp,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- XMLDateTime.cpp	8 Sep 2004 13:56:24 -0000	1.28
  +++ XMLDateTime.cpp	28 Oct 2004 20:13:35 -0000	1.29
  @@ -17,6 +17,9 @@
   /*
    * $Id$
    * $Log$
  + * Revision 1.29  2004/10/28 20:13:35  peiyongz
  + * Data member reshuffle
  + *
    * Revision 1.28  2004/09/08 13:56:24  peiyongz
    * Apache License Version 2.0
    *
  @@ -508,9 +511,9 @@
   : fStart(0)
   , fEnd(0)
   , fBufferMaxLen(0)
  -, fBuffer(0)
   , fMiliSecond(0)
   , fHasTime(false)
  +, fBuffer(0)
   , fMemoryManager(manager)
   {
       reset();
  @@ -521,9 +524,9 @@
   : fStart(0)
   , fEnd(0)
   , fBufferMaxLen(0)
  -, fBuffer(0)
   , fMiliSecond(0)
   , fHasTime(false)
  +, fBuffer(0)
   , fMemoryManager(manager)
   {
       setBuffer(aString);
  
  
  

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

[prev in list] [next in list] [prev in thread] [next in thread]