Ticket #3471: subsecond_duration-overflow-fix.diff

boost/date_time/microsec_time_clock.hpp

@@ -104 +104 @@
 
       //The following line will adjust the fractional second tick in terms
       //of the current time system.  For example, if the time system
-      //doesn't support fractional seconds then res_adjust returns 0
+      //doesn't support fractional seconds then res_adjust is 0
       //and all the fractional seconds return 0.
-      int adjust = static_cast< int >(resolution_traits_type::res_adjust() / 1000000);
+      int adjust = static_cast< int >(resolution_traits_type::res_adjust / 1000000);
 
       time_duration_type td(static_cast< typename time_duration_type::hour_type >(curr_ptr->tm_hour),
                             static_cast< typename time_duration_type::min_type >(curr_ptr->tm_min),

boost/date_time/time_duration.hpp

@@ -11 +11 @@
 
 #include <boost/cstdint.hpp>
 #include <boost/operators.hpp>
+#include <boost/static_assert.hpp>
 #include <boost/date_time/time_defs.hpp>
 #include <boost/date_time/special_defs.hpp>
 #include <boost/date_time/compiler_config.hpp>
@@ -74 +75 @@
     //! Return the number of ticks in a second
     static tick_type ticks_per_second()
     {
-      return rep_type::res_adjust();
+      return rep_type::res_adjust;
     }
     //! Provide the resolution of this duration type
     static time_resolutions resolution()
@@ -267 +268 @@
   public:
     typedef typename base_duration::traits_type traits_type;
     explicit subsecond_duration(boost::int64_t ss) :
-      base_duration(0,0,0,ss*traits_type::res_adjust()/frac_of_second)
-    {}
+      base_duration(0,0,0,ss * (traits_type::res_adjust / frac_of_second))
+    {
+       BOOST_STATIC_ASSERT((traits_type::res_adjust % frac_of_second) == 0);
+    }
   };
 
 

boost/date_time/time_resolution_traits.hpp

@@ -79 +79 @@
     typedef v_type  min_type;
     typedef v_type  sec_type;
 
+    static const fractional_seconds_type res_adjust = resolution_adjust;
+
     // bring in function from frac_sec_type traits structs
     static fractional_seconds_type as_number(impl_type i)
     {
@@ -104 +106 @@
     {
       return frac_digits;
     }
-    static fractional_seconds_type res_adjust()
-    {
-      return resolution_adjust;
-    }
+
     //! Any negative argument results in a negative tick_count
     static tick_type to_tick_count(hour_type hours,
                                    min_type  minutes,
@@ -122 +121 @@
         fs = absolute_value(fs);
         return (((((fractional_seconds_type(hours)*3600)
                    + (fractional_seconds_type(minutes)*60)
-                   + seconds)*res_adjust()) + fs) * -1);
+                   + seconds)*res_adjust) + fs) * -1);
       }
 
       return (((fractional_seconds_type(hours)*3600)
                + (fractional_seconds_type(minutes)*60)
-               + seconds)*res_adjust()) + fs;
+               + seconds)*res_adjust) + fs;
     }
 
   };

boost/date_time/time_system_counted.hpp

@@ -88 +88 @@
     static int_type frac_sec_per_day()
     {
       int_type seconds_per_day = 60*60*24;
-      int_type fractional_sec_per_sec(resolution_traits::res_adjust());
+      int_type fractional_sec_per_sec(resolution_traits::res_adjust);
       return seconds_per_day*fractional_sec_per_sec;
     }
     bool is_pos_infinity()const