passenger 6.0.7 → 6.0.8

data/src/cxx_supportlib/vendor-modified/boost/date_time/dst_rules.hpp

@@ -2,7 +2,7 @@
 #define DATE_TIME_DST_RULES_HPP__
 
 /* Copyright (c) 2002,2003, 2007 CrystalClear Software, Inc.
- * Use, modification and distribution is subject to the 
+ * Use, modification and distribution is subject to the
  * Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  * Author: Jeff Garland, Bart Garst
@@ -21,12 +21,12 @@
 namespace boost {
   namespace date_time {
 
-    enum time_is_dst_result {is_not_in_dst, is_in_dst, 
+    enum time_is_dst_result {is_not_in_dst, is_in_dst,
                              ambiguous, invalid_time_label};
 
 
     //! Dynamic class used to caluclate dst transition information
-    template<class date_type_, 
+    template<class date_type_,
              class time_duration_type_>
     class dst_calculator
     {
@@ -37,14 +37,14 @@ namespace boost {
       //! Check the local time offset when on dst start day
       /*! On this dst transition, the time label between
        *  the transition boundary and the boudary + the offset
-       *  are invalid times.  If before the boundary then still 
-       *  not in dst.  
+       *  are invalid times.  If before the boundary then still
+       *  not in dst.
        *@param time_of_day Time offset in the day for the local time
        *@param dst_start_offset_minutes Local day offset for start of dst
        *@param dst_length_minutes Number of minutes to adjust clock forward
        *@retval status of time label w.r.t. dst
        */
-      static time_is_dst_result 
+      static time_is_dst_result
       process_local_dst_start_day(const time_duration_type& time_of_day,
                                   unsigned int dst_start_offset_minutes,
                                   long dst_length_minutes)
@@ -57,19 +57,19 @@ namespace boost {
         if (time_of_day >= time_duration_type(0,offset,0)) {
           return is_in_dst;
         }
-        return invalid_time_label; 
+        return invalid_time_label;
       }
 
       //! Check the local time offset when on the last day of dst
       /*! This is the calculation for the DST end day.  On that day times
-       *  prior to the conversion time - dst_length (1 am in US) are still 
-       *  in dst.  Times between the above and the switch time are 
+       *  prior to the conversion time - dst_length (1 am in US) are still
+       *  in dst.  Times between the above and the switch time are
        *  ambiguous.  Times after the start_offset are not in dst.
        *@param time_of_day Time offset in the day for the local time
        *@param dst_end_offset_minutes Local time of day for end of dst
        *@retval status of time label w.r.t. dst
        */
-      static time_is_dst_result 
+      static time_is_dst_result
       process_local_dst_end_day(const time_duration_type& time_of_day,
                                 unsigned int dst_end_offset_minutes,
                                 long dst_length_minutes)
@@ -86,32 +86,32 @@ namespace boost {
       }
 
       //! Calculates if the given local time is dst or not
-      /*! Determines if the time is really in DST or not.  Also checks for 
+      /*! Determines if the time is really in DST or not.  Also checks for
        *  invalid and ambiguous.
        *  @param current_day The day to check for dst
-       *  @param time_of_day Time offset within the day to check 
+       *  @param time_of_day Time offset within the day to check
        *  @param dst_start_day  Starting day of dst for the given locality
        *  @param dst_start_offset Time offset within day for dst boundary
        *  @param dst_end_day    Ending day of dst for the given locality
        *  @param dst_end_offset Time offset within day given in dst for dst boundary
-       *  @param dst_length lenght of dst adjusment
+       *  @param dst_length_minutes length of dst adjusment
        *  @retval The time is either ambiguous, invalid, in dst, or not in dst
        */
-      static time_is_dst_result 
+      static time_is_dst_result
       local_is_dst(const date_type& current_day,
                    const time_duration_type& time_of_day,
                    const date_type& dst_start_day,
                    const time_duration_type& dst_start_offset,
                    const date_type& dst_end_day,
                    const time_duration_type& dst_end_offset,
-                   const time_duration_type& dst_length_minutes)
+                   const time_duration_type& dst_length)
       {
         unsigned int start_minutes = static_cast<unsigned>(
           dst_start_offset.hours() * 60 + dst_start_offset.minutes());
         unsigned int end_minutes = static_cast<unsigned>(
           dst_end_offset.hours() * 60 + dst_end_offset.minutes());
         long length_minutes = static_cast<long>(
-          dst_length_minutes.hours() * 60 + dst_length_minutes.minutes());
+          dst_length.hours() * 60 + dst_length.minutes());
 
         return local_is_dst(current_day, time_of_day,
                             dst_start_day, start_minutes,
@@ -120,20 +120,20 @@ namespace boost {
       }
 
       //! Calculates if the given local time is dst or not
-      /*! Determines if the time is really in DST or not.  Also checks for 
+      /*! Determines if the time is really in DST or not.  Also checks for
        *  invalid and ambiguous.
        *  @param current_day The day to check for dst
-       *  @param time_of_day Time offset within the day to check 
+       *  @param time_of_day Time offset within the day to check
        *  @param dst_start_day  Starting day of dst for the given locality
-       *  @param dst_start_offset_minutes Offset within day for dst 
+       *  @param dst_start_offset_minutes Offset within day for dst
        *         boundary (eg 120 for US which is 02:00:00)
        *  @param dst_end_day    Ending day of dst for the given locality
-       *  @param dst_end_offset_minutes Offset within day given in dst for dst 
+       *  @param dst_end_offset_minutes Offset within day given in dst for dst
        *         boundary (eg 120 for US which is 02:00:00)
        *  @param dst_length_minutes Length of dst adjusment (eg: 60 for US)
        *  @retval The time is either ambiguous, invalid, in dst, or not in dst
        */
-      static time_is_dst_result 
+      static time_is_dst_result
       local_is_dst(const date_type& current_day,
                    const time_duration_type& time_of_day,
                    const date_type& dst_start_day,
@@ -165,7 +165,7 @@ namespace boost {
                                              dst_start_offset_minutes,
                                              dst_length_minutes);
         }
-      
+
         if (current_day == dst_end_day) {
           return process_local_dst_end_day(time_of_day,
                                            dst_end_offset_minutes,
@@ -183,29 +183,29 @@ namespace boost {
      * calculation at compile time covering all the cases.  Unfortunately
      * because of the number of dimensions related to daylight savings
      * calculation the number of parameters is high.  In addition, the
-     * start and end transition rules are complex types that specify 
+     * start and end transition rules are complex types that specify
      * an algorithm for calculation of the starting day and ending
-     * day of daylight savings time including the month and day 
+     * day of daylight savings time including the month and day
      * specifications (eg: last sunday in October).
      *
      * @param date_type A type that represents dates, typically gregorian::date
      * @param time_duration_type Used for the offset in the day calculations
-     * @param dst_traits A set of traits that define the rules of dst 
+     * @param dst_traits A set of traits that define the rules of dst
      *        calculation.  The dst_trait must include the following:
      * start_rule_functor - Rule to calculate the starting date of a
      *                      dst transition (eg: last_kday_of_month).
-     * start_day - static function that returns month of dst start for 
+     * start_day - static function that returns month of dst start for
      *             start_rule_functor
-     * start_month -static function that returns day or day of week for 
+     * start_month -static function that returns day or day of week for
      *              dst start of dst
      * end_rule_functor - Rule to calculate the end of dst day.
      * end_day - static fucntion that returns end day for end_rule_functor
      * end_month - static function that returns end month for end_rule_functor
      * dst_start_offset_minutes - number of minutes from start of day to transition to dst -- 120 (or 2:00 am) is typical for the U.S. and E.U.
-     * dst_start_offset_minutes - number of minutes from start of day to transition off of dst -- 180 (or 3:00 am) is typical for E.U. 
+     * dst_start_offset_minutes - number of minutes from start of day to transition off of dst -- 180 (or 3:00 am) is typical for E.U.
      * dst_length_minutes - number of minutes that dst shifts clock
      */
-    template<class date_type, 
+    template<class date_type,
              class time_duration_type,
              class dst_traits>
     class dst_calc_engine
@@ -216,12 +216,12 @@ namespace boost {
       typedef dst_calculator<date_type, time_duration_type> dstcalc;
 
       //! Calculates if the given local time is dst or not
-      /*! Determines if the time is really in DST or not.  Also checks for 
+      /*! Determines if the time is really in DST or not.  Also checks for
        *  invalid and ambiguous.
        *  @retval The time is either ambiguous, invalid, in dst, or not in dst
        */
       static time_is_dst_result local_is_dst(const date_type& d,
-                                             const time_duration_type& td) 
+                                             const time_duration_type& td)
       {
 
         year_type y = d.year();
@@ -230,10 +230,10 @@ namespace boost {
         return dstcalc::local_is_dst(d,td,
                                      dst_start,
                                      dst_traits::dst_start_offset_minutes(),
-                                     dst_end, 
-                                     dst_traits::dst_end_offset_minutes(), 
+                                     dst_end,
+                                     dst_traits::dst_end_offset_minutes(),
                                      dst_traits::dst_shift_length_minutes());
-      
+
       }
 
       static bool is_dst_boundary_day(date_type d)
@@ -244,14 +244,14 @@ namespace boost {
       }
 
       //! The time of day for the dst transition (eg: typically 01:00:00 or 02:00:00)
-      static time_duration_type dst_offset() 
+      static time_duration_type dst_offset()
       {
         return time_duration_type(0,dst_traits::dst_shift_length_minutes(),0);
       }
 
       static date_type local_dst_start_day(year_type year)
       {
-        return dst_traits::local_dst_start_day(year);      
+        return dst_traits::local_dst_start_day(year);
       }
 
       static date_type local_dst_end_day(year_type year)
@@ -267,11 +267,11 @@ namespace boost {
      * In 2007 US/Canada DST rules changed
      * (http://en.wikipedia.org/wiki/Energy_Policy_Act_of_2005#Change_to_daylight_saving_time).
      */
-    template<class date_type_, 
+    template<class date_type_,
              class time_duration_type_,
-             unsigned int dst_start_offset_minutes=120, //from start of day 
+             unsigned int dst_start_offset_minutes=120, //from start of day
              short dst_length_minutes=60>  //1 hour == 60 min in US
-    class us_dst_rules 
+    class us_dst_rules
     {
     public:
       typedef time_duration_type_ time_duration_type;
@@ -284,12 +284,12 @@ namespace boost {
       typedef dst_calculator<date_type, time_duration_type> dstcalc;
 
       //! Calculates if the given local time is dst or not
-      /*! Determines if the time is really in DST or not.  Also checks for 
+      /*! Determines if the time is really in DST or not.  Also checks for
        *  invalid and ambiguous.
        *  @retval The time is either ambiguous, invalid, in dst, or not in dst
        */
       static time_is_dst_result local_is_dst(const date_type& d,
-                                             const time_duration_type& td) 
+                                             const time_duration_type& td)
       {
 
         year_type y = d.year();
@@ -297,9 +297,9 @@ namespace boost {
         date_type dst_end   = local_dst_end_day(y);
         return dstcalc::local_is_dst(d,td,
                                      dst_start,dst_start_offset_minutes,
-                                     dst_end, dst_start_offset_minutes, 
+                                     dst_end, dst_start_offset_minutes,
                                      dst_length_minutes);
-      
+
       }
 
 
@@ -314,12 +314,12 @@ namespace boost {
       {
         if (year >= year_type(2007)) {
           //second sunday in march
-          nkday ssim(nkday::second, Sunday, gregorian::Mar);
-          return ssim.get_date(year);      
+          nkday ssim(nkday::second, Sunday, date_time::Mar);
+          return ssim.get_date(year);
         } else {
           //first sunday in april
-          fkday fsia(Sunday, gregorian::Apr);
-          return fsia.get_date(year);      
+          fkday fsia(Sunday, date_time::Apr);
+          return fsia.get_date(year);
         }
       }
 
@@ -327,11 +327,11 @@ namespace boost {
       {
         if (year >= year_type(2007)) {
           //first sunday in november
-          fkday fsin(Sunday, gregorian::Nov);
-          return fsin.get_date(year);      
+          fkday fsin(Sunday, date_time::Nov);
+          return fsin.get_date(year);
         } else {
           //last sunday in october
-          lkday lsio(Sunday, gregorian::Oct);
+          lkday lsio(Sunday, date_time::Oct);
           return lsio.get_date(year);
         }
       }
@@ -358,15 +358,15 @@ namespace boost {
       //! Calculates if the given local time is dst or not
       /*! @retval Always is_not_in_dst since this is for zones without dst
        */
-      static time_is_dst_result local_is_dst(const date_type&, 
-                                             const time_duration_type&) 
+      static time_is_dst_result local_is_dst(const date_type&,
+                                             const time_duration_type&)
       {
         return is_not_in_dst;
       }
-    
+
       //! Calculates if the given utc time is in dst
-      static time_is_dst_result utc_is_dst(const date_type&, 
-                                           const time_duration_type&) 
+      static time_is_dst_result utc_is_dst(const date_type&,
+                                           const time_duration_type&)
       {
         return is_not_in_dst;
       }
@@ -376,7 +376,7 @@ namespace boost {
         return false;
       }
 
-      static time_duration_type dst_offset() 
+      static time_duration_type dst_offset()
       {
         return time_duration_type(0,0,0);
       }

data/src/cxx_supportlib/vendor-modified/boost/date_time/dst_transition_generators.hpp

@@ -7,7 +7,7 @@
 #ifndef DATE_TIME_DATE_DST_TRANSITION_DAY_GEN_HPP__
 #define DATE_TIME_DATE_DST_TRANSITION_DAY_GEN_HPP__
 
-
+#include <string>
 
 namespace boost {
 namespace date_time {
@@ -29,7 +29,7 @@ namespace date_time {
     //! Canonical form for a class that provides day rule calculation
     /*! This class is used to generate specific sets of dst rules
      *  
-     *@param spec Provides a specifiction of the function object types used
+     *@tparam spec Provides a specifiction of the function object types used
      *            to generate start and end days of daylight savings as well
      *            as the date type.
      */

data/src/cxx_supportlib/vendor-modified/boost/date_time/find_match.hpp

@@ -0,0 +1,42 @@
+#ifndef _BOOST_DATE_TIME_FIND_MATCH_HPP___
+#define _BOOST_DATE_TIME_FIND_MATCH_HPP___
+
+/* Copyright (c) 2002,2003,2005 CrystalClear Software, Inc.
+ * Use, modification and distribution is subject to the
+ * Boost Software License, Version 1.0. (See accompanying
+ * file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
+ * Author: Jeff Garland, Bart Garst
+ * $Date$
+ */
+
+#include <string>
+
+namespace boost {
+namespace date_time {
+
+
+    //! Find index of a string in either of 2 arrays
+    /*! find_match searches both arrays for a match to 's'. Both arrays
+     * must contain 'size' elements. The index of the match is returned.
+     * If no match is found, 'size' is returned.
+     * Ex. "Jan" returns 0, "Dec" returns 11, "Tue" returns 2.
+     * 'size' can be sent in with: (greg_month::max)() (which 12),
+     * (greg_weekday::max)() + 1 (which is 7) or date_time::NumSpecialValues */
+    template<class charT>
+    short find_match(const charT* const* short_names,
+                     const charT* const* long_names,
+                     short size,
+                     const std::basic_string<charT>& s) {
+      for(short i = 0; i < size; ++i){
+        if(short_names[i] == s || long_names[i] == s){
+          return i;
+        }
+      }
+      return size; // not-found, return a value out of range
+    }
+
+
+} } //namespace date_time
+
+
+#endif

data/src/cxx_supportlib/vendor-modified/boost/date_time/format_date_parser.hpp

@@ -3,7 +3,7 @@
 #define DATE_TIME_FORMAT_DATE_PARSER_HPP__
 
 /* Copyright (c) 2004-2005 CrystalClear Software, Inc.
- * Use, modification and distribution is subject to the 
+ * Use, modification and distribution is subject to the
  * Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  * Author: Jeff Garland, Bart Garst
@@ -32,11 +32,11 @@ namespace std {
 }
 #endif
 namespace boost { namespace date_time {
-  
+
 //! Helper function for parsing fixed length strings into integers
-/*! Will consume 'length' number of characters from stream. Consumed 
- * character are transfered to parse_match_result struct. 
- * Returns '-1' if no number can be parsed or incorrect number of 
+/*! Will consume 'length' number of characters from stream. Consumed
+ * character are transfered to parse_match_result struct.
+ * Returns '-1' if no number can be parsed or incorrect number of
  * digits in stream. */
 template<typename int_type, typename charT>
 inline
@@ -50,12 +50,12 @@ fixed_string_to_int(std::istreambuf_iterator<charT>& itr,
   //typedef std::basic_string<charT>  string_type;
   unsigned int j = 0;
   //string_type s;
-  while (j < length && itr != stream_end && 
+  while (j < length && itr != stream_end &&
       (std::isdigit(*itr) || *itr == fill_char)) {
     if(*itr == fill_char) {
-      /* Since a fill_char can be anything, we convert it to a zero. 
+      /* Since a fill_char can be anything, we convert it to a zero.
        * lexical_cast will behave predictably when zero is used as fill. */
-      mr.cache += ('0'); 
+      mr.cache += ('0');
     }
     else {
       mr.cache += (*itr);
@@ -77,9 +77,9 @@ fixed_string_to_int(std::istreambuf_iterator<charT>& itr,
 }
 
 //! Helper function for parsing fixed length strings into integers
-/*! Will consume 'length' number of characters from stream. Consumed 
- * character are transfered to parse_match_result struct. 
- * Returns '-1' if no number can be parsed or incorrect number of 
+/*! Will consume 'length' number of characters from stream. Consumed
+ * character are transfered to parse_match_result struct.
+ * Returns '-1' if no number can be parsed or incorrect number of
  * digits in stream. */
 template<typename int_type, typename charT>
 inline
@@ -93,8 +93,8 @@ fixed_string_to_int(std::istreambuf_iterator<charT>& itr,
 }
 
 //! Helper function for parsing varied length strings into integers
-/*! Will consume 'max_length' characters from stream only if those 
- * characters are digits. Returns '-1' if no number can be parsed. 
+/*! Will consume 'max_length' characters from stream only if those
+ * characters are digits. Returns '-1' if no number can be parsed.
  * Will not parse a number preceeded by a '+' or '-'. */
 template<typename int_type, typename charT>
 inline
@@ -133,7 +133,7 @@ var_string_to_int(std::istreambuf_iterator<charT>& itr,
  -  %W - Week number 00 to 53 where Monday is first day of week 1
  -  %x - facet default date representation
  -  %y - Year without the century - eg: 04 for 2004
- -  %Y - Year with century 
+ -  %Y - Year with century
 
  The weekday specifiers (%a and %A) do not add to the date construction,
  but they provide a way to skip over the weekday names for formats that
@@ -142,7 +142,7 @@ var_string_to_int(std::istreambuf_iterator<charT>& itr,
  todo -- Another interesting feature that this approach could provide is
          an option to fill in any missing fields with the current values
          from the clock.  So if you have %m-%d the parser would detect
-         the missing year value and fill it in using the clock. 
+         the missing year value and fill it in using the clock.
 
  todo -- What to do with the %x.  %x in the classic facet is just bad...
 
@@ -166,7 +166,7 @@ class format_date_parser
   typedef std::vector<std::basic_string<charT> > input_collection_type;
 
   // TODO sv_parser uses its default constructor - write the others
-  
+
   format_date_parser(const string_type& format_str,
                      const input_collection_type& month_short_names,
                      const input_collection_type& month_long_names,
@@ -178,7 +178,7 @@ class format_date_parser
     m_weekday_short_names(weekday_short_names),
     m_weekday_long_names(weekday_long_names)
   {}
-  
+
   format_date_parser(const string_type& format_str,
                      const std::locale& locale) :
     m_format(format_str),
@@ -196,7 +196,7 @@ class format_date_parser
     this->m_weekday_short_names = fdp.m_weekday_short_names;
     this->m_weekday_long_names = fdp.m_weekday_long_names;
   }
-  
+
   string_type format() const
   {
     return m_format;
@@ -225,7 +225,7 @@ class format_date_parser
   }
 
   date_type
-  parse_date(const string_type& value, 
+  parse_date(const string_type& value,
              const string_type& format_str,
              const special_values_parser<date_type,charT>& sv_parser) const
   {
@@ -236,49 +236,49 @@ class format_date_parser
   }
 
   date_type
-  parse_date(std::istreambuf_iterator<charT>& sitr, 
+  parse_date(std::istreambuf_iterator<charT>& sitr,
              std::istreambuf_iterator<charT>& stream_end,
              const special_values_parser<date_type,charT>& sv_parser) const
   {
     return parse_date(sitr, stream_end, m_format, sv_parser);
   }
 
-  /*! Of all the objects that the format_date_parser can parse, only a 
-   * date can be a special value. Therefore, only parse_date checks 
+  /*! Of all the objects that the format_date_parser can parse, only a
+   * date can be a special value. Therefore, only parse_date checks
    * for special_values. */
   date_type
-  parse_date(std::istreambuf_iterator<charT>& sitr, 
+  parse_date(std::istreambuf_iterator<charT>& sitr,
              std::istreambuf_iterator<charT>& stream_end,
              string_type format_str,
              const special_values_parser<date_type,charT>& sv_parser) const
   {
     bool use_current_char = false;
-    
+
     // skip leading whitespace
-    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
+    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; }
 
-    short year(0), month(0), day(0), day_of_year(0);// wkday(0); 
-    /* Initialized the following to their minimum values. These intermediate 
-     * objects are used so we get specific exceptions when part of the input 
-     * is unparsable. 
+    short year(0), month(0), day(0), day_of_year(0);// wkday(0);
+    /* Initialized the following to their minimum values. These intermediate
+     * objects are used so we get specific exceptions when part of the input
+     * is unparsable.
      * Ex: "205-Jan-15" will throw a bad_year, "2005-Jsn-15"- bad_month, etc.*/
     year_type t_year(1400);
     month_type t_month(1);
     day_type t_day(1);
     day_of_week_type wkday(0);
-    
-    
+
+
     const_itr itr(format_str.begin());
     while (itr != format_str.end() && (sitr != stream_end)) {
       if (*itr == '%') {
         if ( ++itr == format_str.end())
-        	break;
+          break;
         if (*itr != '%') {
           switch(*itr) {
-          case 'a': 
+          case 'a':
             {
               //this value is just throw away.  It could be used for
-              //error checking potentially, but it isn't helpful in 
+              //error checking potentially, but it isn't helpful in
               //actually constructing the date - we just need to get it
               //out of the stream
               match_results mr = m_weekday_short_names.match(sitr, stream_end);
@@ -294,10 +294,10 @@ class format_date_parser
               }
               break;
             }
-          case 'A': 
+          case 'A':
             {
               //this value is just throw away.  It could be used for
-              //error checking potentially, but it isn't helpful in 
+              //error checking potentially, but it isn't helpful in
               //actually constructing the date - we just need to get it
               //out of the stream
               match_results mr = m_weekday_long_names.match(sitr, stream_end);
@@ -313,7 +313,7 @@ class format_date_parser
               }
               break;
             }
-          case 'b': 
+          case 'b':
             {
               match_results mr = m_month_short_names.match(sitr, stream_end);
               if(mr.current_match == match_results::PARSE_ERROR) {
@@ -328,7 +328,7 @@ class format_date_parser
               }
               break;
             }
-          case 'B': 
+          case 'B':
             {
               match_results mr = m_month_long_names.match(sitr, stream_end);
               if(mr.current_match == match_results::PARSE_ERROR) {
@@ -343,7 +343,7 @@ class format_date_parser
               }
               break;
             }
-          case 'd': 
+          case 'd':
             {
               match_results mr;
               day = fixed_string_to_int<short, charT>(sitr, stream_end, mr, 2);
@@ -355,7 +355,7 @@ class format_date_parser
               t_day = day_type(day);
               break;
             }
-          case 'e': 
+          case 'e':
             {
               match_results mr;
               day = fixed_string_to_int<short, charT>(sitr, stream_end, mr, 2, ' ');
@@ -367,7 +367,7 @@ class format_date_parser
               t_day = day_type(day);
               break;
             }
-          case 'j': 
+          case 'j':
             {
               match_results mr;
               day_of_year = fixed_string_to_int<short, charT>(sitr, stream_end, mr, 3);
@@ -381,7 +381,7 @@ class format_date_parser
               t_day_of_year = day_of_year_type(day_of_year);
               break;
             }
-          case 'm': 
+          case 'm':
             {
               match_results mr;
               month = fixed_string_to_int<short, charT>(sitr, stream_end, mr, 2);
@@ -393,7 +393,7 @@ class format_date_parser
               t_month = month_type(month);
               break;
             }
-          case 'Y': 
+          case 'Y':
             {
               match_results mr;
               year = fixed_string_to_int<short, charT>(sitr, stream_end, mr, 4);
@@ -405,7 +405,7 @@ class format_date_parser
               t_year = year_type(year);
               break;
             }
-          case 'y': 
+          case 'y':
             {
               match_results mr;
               year = fixed_string_to_int<short, charT>(sitr, stream_end, mr, 2);
@@ -420,14 +420,14 @@ class format_date_parser
             }
           default:
             {} //ignore those we don't understand
-            
+
           }//switch
-          
+
         }
         else { // itr == '%', second consecutive
           sitr++;
         }
-        
+
         itr++; //advance past format specifier
       }
       else {  //skip past chars in format and in buffer
@@ -440,48 +440,48 @@ class format_date_parser
         }
       }
     }
-    
+
     if (day_of_year > 0) {
       date_type d(static_cast<unsigned short>(year-1),12,31); //end of prior year
       return d + duration_type(day_of_year);
     }
-    
-    return date_type(t_year, t_month, t_day); // exceptions were thrown earlier 
-                                        // if input was no good 
+
+    return date_type(t_year, t_month, t_day); // exceptions were thrown earlier
+                                        // if input was no good
   }
- 
+
   //! Throws bad_month if unable to parse
   month_type
-  parse_month(std::istreambuf_iterator<charT>& sitr, 
+  parse_month(std::istreambuf_iterator<charT>& sitr,
              std::istreambuf_iterator<charT>& stream_end,
              string_type format_str) const
   {
     match_results mr;
     return parse_month(sitr, stream_end, format_str, mr);
   }
- 
+
   //! Throws bad_month if unable to parse
   month_type
-  parse_month(std::istreambuf_iterator<charT>& sitr, 
+  parse_month(std::istreambuf_iterator<charT>& sitr,
              std::istreambuf_iterator<charT>& stream_end,
              string_type format_str,
              match_results& mr) const
   {
     bool use_current_char = false;
-    
+
     // skip leading whitespace
-    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
+    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; }
 
     short month(0);
-    
+
     const_itr itr(format_str.begin());
     while (itr != format_str.end() && (sitr != stream_end)) {
       if (*itr == '%') {
         if ( ++itr == format_str.end())
-        	break;
+          break;
         if (*itr != '%') {
           switch(*itr) {
-          case 'b': 
+          case 'b':
             {
               mr = m_month_short_names.match(sitr, stream_end);
               month = mr.current_match;
@@ -490,7 +490,7 @@ class format_date_parser
               }
               break;
             }
-          case 'B': 
+          case 'B':
             {
               mr = m_month_long_names.match(sitr, stream_end);
               month = mr.current_match;
@@ -499,23 +499,23 @@ class format_date_parser
               }
               break;
             }
-          case 'm': 
+          case 'm':
             {
               month = var_string_to_int<short, charT>(sitr, stream_end, 2);
-              // var_string_to_int returns -1 if parse failed. That will 
+              // var_string_to_int returns -1 if parse failed. That will
               // cause a bad_month exception to be thrown so we do nothing here
               break;
             }
           default:
             {} //ignore those we don't understand
-            
+
           }//switch
-          
+
         }
         else { // itr == '%', second consecutive
           sitr++;
         }
-        
+
         itr++; //advance past format specifier
       }
       else {  //skip past chars in format and in buffer
@@ -528,27 +528,27 @@ class format_date_parser
         }
       }
     }
-    
+
     return month_type(month); // throws bad_month exception when values are zero
   }
 
   //! Expects 1 or 2 digits 1-31. Throws bad_day_of_month if unable to parse
   day_type
-  parse_var_day_of_month(std::istreambuf_iterator<charT>& sitr, 
+  parse_var_day_of_month(std::istreambuf_iterator<charT>& sitr,
                          std::istreambuf_iterator<charT>& stream_end) const
   {
     // skip leading whitespace
-    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
+    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; }
 
     return day_type(var_string_to_int<short, charT>(sitr, stream_end, 2));
   }
   //! Expects 2 digits 01-31. Throws bad_day_of_month if unable to parse
   day_type
-  parse_day_of_month(std::istreambuf_iterator<charT>& sitr, 
+  parse_day_of_month(std::istreambuf_iterator<charT>& sitr,
                      std::istreambuf_iterator<charT>& stream_end) const
   {
     // skip leading whitespace
-    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
+    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; }
 
     //return day_type(var_string_to_int<short, charT>(sitr, stream_end, 2));
     match_results mr;
@@ -556,7 +556,7 @@ class format_date_parser
   }
 
   day_of_week_type
-  parse_weekday(std::istreambuf_iterator<charT>& sitr, 
+  parse_weekday(std::istreambuf_iterator<charT>& sitr,
              std::istreambuf_iterator<charT>& stream_end,
              string_type format_str) const
   {
@@ -564,29 +564,29 @@ class format_date_parser
     return parse_weekday(sitr, stream_end, format_str, mr);
   }
   day_of_week_type
-  parse_weekday(std::istreambuf_iterator<charT>& sitr, 
+  parse_weekday(std::istreambuf_iterator<charT>& sitr,
              std::istreambuf_iterator<charT>& stream_end,
              string_type format_str,
              match_results& mr) const
   {
     bool use_current_char = false;
-    
+
     // skip leading whitespace
-    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
+    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; }
 
     short wkday(0);
-    
+
     const_itr itr(format_str.begin());
     while (itr != format_str.end() && (sitr != stream_end)) {
       if (*itr == '%') {
         if ( ++itr == format_str.end())
-        	break;
+          break;
         if (*itr != '%') {
           switch(*itr) {
-          case 'a': 
+          case 'a':
             {
               //this value is just throw away.  It could be used for
-              //error checking potentially, but it isn't helpful in 
+              //error checking potentially, but it isn't helpful in
               //actually constructing the date - we just need to get it
               //out of the stream
               mr = m_weekday_short_names.match(sitr, stream_end);
@@ -596,10 +596,10 @@ class format_date_parser
               }
               break;
             }
-          case 'A': 
+          case 'A':
             {
               //this value is just throw away.  It could be used for
-              //error checking potentially, but it isn't helpful in 
+              //error checking potentially, but it isn't helpful in
               //actually constructing the date - we just need to get it
               //out of the stream
               mr = m_weekday_long_names.match(sitr, stream_end);
@@ -617,14 +617,14 @@ class format_date_parser
             }
           default:
             {} //ignore those we don't understand
-            
+
           }//switch
-          
+
         }
         else { // itr == '%', second consecutive
           sitr++;
         }
-        
+
         itr++; //advance past format specifier
       }
       else {  //skip past chars in format and in buffer
@@ -637,14 +637,14 @@ class format_date_parser
         }
       }
     }
-    
-    return day_of_week_type(wkday); // throws bad_day_of_month exception 
+
+    return day_of_week_type(wkday); // throws bad_day_of_month exception
                                     // when values are zero
   }
-  
+
   //! throws bad_year if unable to parse
   year_type
-  parse_year(std::istreambuf_iterator<charT>& sitr, 
+  parse_year(std::istreambuf_iterator<charT>& sitr,
              std::istreambuf_iterator<charT>& stream_end,
              string_type format_str) const
   {
@@ -654,21 +654,21 @@ class format_date_parser
 
   //! throws bad_year if unable to parse
   year_type
-  parse_year(std::istreambuf_iterator<charT>& sitr, 
+  parse_year(std::istreambuf_iterator<charT>& sitr,
              std::istreambuf_iterator<charT>& stream_end,
              string_type format_str,
              match_results& mr) const
   {
     // skip leading whitespace
-    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; } 
+    while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; }
 
     unsigned short year(0);
-    
+
     const_itr itr(format_str.begin());
     while (itr != format_str.end() && (sitr != stream_end)) {
       if (*itr == '%') {
         if ( ++itr == format_str.end())
-        	break;
+          break;
         if (*itr != '%') {
           //match_results mr;
           switch(*itr) {
@@ -687,14 +687,14 @@ class format_date_parser
             }
           default:
             {} //ignore those we don't understand
-            
+
           }//switch
-          
+
         }
         else { // itr == '%', second consecutive
           sitr++;
         }
-        
+
         itr++; //advance past format specifier
       }
       else {  //skip past chars in format and in buffer
@@ -702,11 +702,11 @@ class format_date_parser
         sitr++;
       }
     }
-    
+
     return year_type(year); // throws bad_year exception when values are zero
   }
-  
-  
+
+
  private:
   string_type m_format;
   parse_tree_type m_month_short_names;