import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / date_time / dst_rules.hpp

diff --git a/ceph/src/boost/boost/date_time/dst_rules.hpp b/ceph/src/boost/boost/date_time/dst_rules.hpp
index 73a98996d81a4d429c784ab9bb5dc8deb2b30eeb..0c7aecef974708726173c0df3fd50bac81722ffe 100644 (file)
--- a/ceph/src/boost/boost/date_time/dst_rules.hpp
+++ b/ceph/src/boost/boost/date_time/dst_rules.hpp
@@ -94,7 +94,7 @@ namespace boost {
        *  @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 
@@ -104,14 +104,14 @@ namespace boost {
                    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,