From 886119399955e0898d1c2d8e695f140ca4340cb6 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 5 Jul 2014 12:53:31 -0400 Subject: [PATCH] Date - Simplified ::daysInMonth. --- src/Date.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Date.cpp b/src/Date.cpp index 88a4a4a30..9b0d3b573 100644 --- a/src/Date.cpp +++ b/src/Date.cpp @@ -387,13 +387,12 @@ bool Date::leapYear (int year) //////////////////////////////////////////////////////////////////////////////// int Date::daysInMonth (int month, int year) { - static int days[2][12] = - { - {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, - {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31} - }; + static int days[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - return days[Date::leapYear (year) ? 1 : 0][month - 1]; + if (month == 2 && Date::leapYear (year)) + return 29; + + return days[month - 1]; } ////////////////////////////////////////////////////////////////////////////////