Reducing header overuse, non-inlining selected methods (CPPOST-35).

[shibboleth/xmltooling.git] / xmltooling / util / DateTime.h

diff --git a/xmltooling/util/DateTime.h b/xmltooling/util/DateTime.h
index b3fa78f..7a1ced1 100644 (file)
--- a/xmltooling/util/DateTime.h
+++ b/xmltooling/util/DateTime.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ namespace xmltooling
         DateTime& operator=(const DateTime&);
         ~DateTime();
 
-        inline void setBuffer(const XMLCh* const);
+        void setBuffer(const XMLCh* const);
 
         const XMLCh* getRawData() const;
         const XMLCh* getFormattedString() const;
@@ -117,14 +117,14 @@ namespace xmltooling
         static int compareResult(int, int, bool);
         static void addDuration(DateTime* pDuration, const DateTime* const pBaseDate, int index);
         static int compareResult(const DateTime* const, const DateTime* const, bool, int);
-        static inline int getRetVal(int, int);
+        static int getRetVal(int, int);
 
-        inline void reset();
+        void reset();
         //inline void assertBuffer() const;
-        inline void copy(const DateTime&);
+        void copy(const DateTime&);
 
-        inline void initParser();
-        inline bool isNormalized() const;
+        void initParser();
+        bool isNormalized() const;
 
         void getDate();
         void getTime();
@@ -157,77 +157,6 @@ namespace xmltooling
         double fMiliSecond;
         bool fHasTime;
     };
-
-    inline void DateTime::setBuffer(const XMLCh* const aString)
-    {
-        reset();
-        fEnd = (int) xercesc::XMLString::stringLen(aString);
-        if (fEnd > 0) {
-            if (fEnd > fBufferMaxLen) {
-                delete[] fBuffer;
-                fBufferMaxLen = fEnd + 8;
-                fBuffer = new XMLCh[fBufferMaxLen+1];
-            }
-            memcpy(fBuffer, aString, (fEnd+1) * sizeof(XMLCh));
-        }
-    }
-
-    inline void DateTime::reset()
-    {
-        for ( int i=0; i < xercesc::XMLDateTime::TOTAL_SIZE; i++ )
-            fValue[i] = 0;
-
-        fMiliSecond   = 0;
-        fHasTime      = false;
-        fTimeZone[hh] = fTimeZone[mm] = 0;
-        fStart = fEnd = 0;
-
-        if (fBuffer)
-            *fBuffer = 0;
-    }
-
-    inline void DateTime::copy(const DateTime& rhs)
-    {
-        for ( int i = 0; i < xercesc::XMLDateTime::TOTAL_SIZE; i++ )
-            fValue[i] = rhs.fValue[i];
-
-        fMiliSecond   = rhs.fMiliSecond;
-        fHasTime      = rhs.fHasTime;
-        fTimeZone[hh] = rhs.fTimeZone[hh];
-        fTimeZone[mm] = rhs.fTimeZone[mm];
-        fStart = rhs.fStart;
-        fEnd   = rhs.fEnd;
-
-        if (fEnd > 0) {
-            if (fEnd > fBufferMaxLen) {
-                delete[] fBuffer;
-                fBufferMaxLen = rhs.fBufferMaxLen;
-                fBuffer = new XMLCh[fBufferMaxLen+1];
-            }
-            memcpy(fBuffer, rhs.fBuffer, (fEnd+1) * sizeof(XMLCh));
-        }
-    }
-
-    inline void DateTime::initParser()
-    {
-        fStart = 0;   // to ensure scan from the very first beginning
-                      // in case the pointer is updated accidentally by someone else.
-    }
-
-    inline bool DateTime::isNormalized() const
-    {
-        return (fValue[xercesc::XMLDateTime::utc] == xercesc::XMLDateTime::UTC_STD ? true : false);
-    }
-
-    inline int DateTime::getRetVal(int c1, int c2)
-    {
-        if ((c1 == xercesc::XMLDateTime::LESS_THAN && c2 == xercesc::XMLDateTime::GREATER_THAN) ||
-            (c1 == xercesc::XMLDateTime::GREATER_THAN && c2 == xercesc::XMLDateTime::LESS_THAN))
-            return xercesc::XMLDateTime::INDETERMINATE;
-
-        return (c1 != xercesc::XMLDateTime::INDETERMINATE) ? c1 : c2;
-    }
-
 }
 
 #endif /* __xmltool_datetime_h__ */