diff options
Diffstat (limited to 'boost/date_time/gregorian_calendar.ipp')
-rw-r--r-- | boost/date_time/gregorian_calendar.ipp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/boost/date_time/gregorian_calendar.ipp b/boost/date_time/gregorian_calendar.ipp index 8a58c8844a..7b43ea8512 100644 --- a/boost/date_time/gregorian_calendar.ipp +++ b/boost/date_time/gregorian_calendar.ipp @@ -44,12 +44,12 @@ namespace date_time { unsigned long week = (juliantoday + day - julianbegin + 4)/7; if ((week >= 1) && (week <= 52)) { - return week; + return static_cast<int>(week); } if (week == 53) { if((day==6) ||(day == 5 && is_leap_year(ymd.year))) { - return week; //under these circumstances week == 53. + return static_cast<int>(week); //under these circumstances week == 53. } else { return 1; //monday - wednesday is in week 1 of next year } @@ -60,10 +60,10 @@ namespace date_time { juliantoday = julian_day_number(ymd); day = (julianbegin + 3) % 7; week = (juliantoday + day - julianbegin + 4)/7; - return week; + return static_cast<int>(week); } - return week; //not reachable -- well except if day == 5 and is_leap_year != true + return static_cast<int>(week); //not reachable -- well except if day == 5 and is_leap_year != true } @@ -79,7 +79,7 @@ namespace date_time { unsigned short y = static_cast<unsigned short>(ymd.year + 4800 - a); unsigned short m = static_cast<unsigned short>(ymd.month + 12*a - 3); unsigned long d = ymd.day + ((153*m + 2)/5) + 365*y + (y/4) - (y/100) + (y/400) - 32045; - return d; + return static_cast<date_int_type>(d); } //! Convert a year-month-day into the julian day number |