You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by pe...@apache.org on 2001/11/09 21:41:45 UTC

cvs commit: xml-xerces/c/src/util XMLDateTime.cpp XMLDateTime.hpp

peiyongz    01/11/09 12:41:45

  Modified:    c/src/util XMLDateTime.cpp XMLDateTime.hpp
  Log:
  Fix: compilation error on Solaris and AIX.
  
  Revision  Changes    Path
  1.2       +10 -7     xml-xerces/c/src/util/XMLDateTime.cpp
  
  Index: XMLDateTime.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/XMLDateTime.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDateTime.cpp	2001/11/07 19:16:03	1.1
  +++ XMLDateTime.cpp	2001/11/09 20:41:45	1.2
  @@ -55,8 +55,11 @@
    */
   
   /*
  - * $Id: XMLDateTime.cpp,v 1.1 2001/11/07 19:16:03 peiyongz Exp $
  + * $Id: XMLDateTime.cpp,v 1.2 2001/11/09 20:41:45 peiyongz Exp $
    * $Log: XMLDateTime.cpp,v $
  + * Revision 1.2  2001/11/09 20:41:45  peiyongz
  + * Fix: compilation error on Solaris and AIX.
  + *
    * Revision 1.1  2001/11/07 19:16:03  peiyongz
    * DateTime Port
    *
  @@ -122,12 +125,12 @@
   // see 3.2.6 duration W3C schema datatype specs
   //
   // the dates are in format: {CCYY,MM,DD, H, S, M, MS, timezone}  
  -const int XMLDateTime::DATETIMES[4][TOTAL_SIZE] = 
  +const int DATETIMES[][XMLDateTime::TOTAL_SIZE] = 
   {
  -    {1696, 9, 1, 0, 0, 0, 0, UTC_STD},     
  -	{1697, 2, 1, 0, 0, 0, 0, UTC_STD},
  -	{1903, 3, 1, 0, 0, 0, 0, UTC_STD},
  -	{1903, 7, 1, 0, 0, 0, 0, UTC_STD}
  +    {1696, 9, 1, 0, 0, 0, 0, XMLDateTime::UTC_STD},     
  +	{1697, 2, 1, 0, 0, 0, 0, XMLDateTime::UTC_STD},
  +	{1903, 3, 1, 0, 0, 0, 0, XMLDateTime::UTC_STD},
  +	{1903, 7, 1, 0, 0, 0, 0, XMLDateTime::UTC_STD}
   };
   
   // ---------------------------------------------------------------------------
  
  
  
  1.2       +29 -28    xml-xerces/c/src/util/XMLDateTime.hpp
  
  Index: XMLDateTime.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/util/XMLDateTime.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDateTime.hpp	2001/11/07 19:16:03	1.1
  +++ XMLDateTime.hpp	2001/11/09 20:41:45	1.2
  @@ -55,8 +55,11 @@
    */
   
   /*
  - * $Id: XMLDateTime.hpp,v 1.1 2001/11/07 19:16:03 peiyongz Exp $
  + * $Id: XMLDateTime.hpp,v 1.2 2001/11/09 20:41:45 peiyongz Exp $
    * $Log: XMLDateTime.hpp,v $
  + * Revision 1.2  2001/11/09 20:41:45  peiyongz
  + * Fix: compilation error on Solaris and AIX.
  + *
    * Revision 1.1  2001/11/07 19:16:03  peiyongz
    * DateTime Port
    *
  @@ -84,6 +87,27 @@
           INDETERMINATE = 2
       };
   
  +	enum valueIndex
  +    {
  +        CentYear   = 0,
  +        Month      ,
  +        Day        ,
  +        Hour       ,
  +        Minute     ,
  +        Second     ,
  +        MiliSecond ,
  +        utc        ,
  +        TOTAL_SIZE   
  +    };
  +
  +    enum utcType 
  +    {
  +        UTC_UNKNOWN = 0,
  +        UTC_STD        ,          // set in parse() or normalize()
  +        UTC_POS        ,          // set in parse()
  +        UTC_NEG                   // set in parse()
  +    };
  +
       // -----------------------------------------------------------------------
       // ctors and dtor
       // -----------------------------------------------------------------------
  @@ -153,36 +177,13 @@
       // Constant data
       // -----------------------------------------------------------------------
   	//
  -	enum valueIndex
  -    {
  -        CentYear   = 0,
  -        Month      = 1,
  -        Day        = 2,
  -        Hour       = 3,
  -        Minute     = 4,
  -        Second     = 5,
  -        MiliSecond = 6,
  -        utc        = 7,
  -        TOTAL_SIZE = 8   
  -    };
  -
       enum timezoneIndex 
       {
           hh = 0,
  -        mm = 1,
  -        TIMEZONE_ARRAYSIZE = 2
  +        mm ,
  +        TIMEZONE_ARRAYSIZE
       };
   
  -    enum utcType 
  -    {
  -        UTC_UNKNOWN = 0,
  -        UTC_STD = 1,          // set in parse() or normalize()
  -        UTC_POS = 2,          // set in parse()
  -        UTC_NEG = 3           // set in parse()
  -    };
  -
  -    static const int      DATETIMES[4][TOTAL_SIZE];
  -
       // -----------------------------------------------------------------------
       // Comparison 
       // -----------------------------------------------------------------------
  @@ -235,7 +236,7 @@
       // locator and converter
       // -----------------------------------------------------------------------
   
  -    int                   findUTCSign(int start);
  +    int                   findUTCSign(const int start);
   
       int                   indexOf(const int start
                                   , const int end
  
  
  

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