diff options
| author | Craig Earls <enderw88@gmail.com> | 2011-10-06 22:07:01 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2011-10-06 22:07:01 -0700 |
| commit | b400d65be082165f44e769605aa6a78133cf6d9a (patch) | |
| tree | 27b18ee35a5c4f60a10cf4f626e15ac30276040b /src/times.cc | |
| parent | e9ccb012c2c5ffe0e9f4916ee859bda95d9d4248 (diff) | |
| parent | f0791bbd7297e737d9e13d0b0bb21473b173b2a7 (diff) | |
| download | fork-ledger-b400d65be082165f44e769605aa6a78133cf6d9a.tar.gz fork-ledger-b400d65be082165f44e769605aa6a78133cf6d9a.tar.bz2 fork-ledger-b400d65be082165f44e769605aa6a78133cf6d9a.zip | |
Merge remote branch 'upstream/next' into next
Diffstat (limited to 'src/times.cc')
| -rw-r--r-- | src/times.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/times.cc b/src/times.cc index 5249c11c..7fc9c21e 100644 --- a/src/times.cc +++ b/src/times.cc @@ -280,7 +280,7 @@ optional<date_time::weekdays> string_to_day_of_week(const std::string& str) else return none; } - + optional<date_time::months_of_year> string_to_month_of_year(const std::string& str) { @@ -709,12 +709,9 @@ void date_parser_t::determine_when(date_parser_t::lexer_t::token_t& tok, when += gregorian::years(amount * adjust); break; case lexer_t::token_t::TOK_QUARTER: - case lexer_t::token_t::TOK_QUARTERS: { - date_t temp = - date_duration_t::find_nearest(today, date_duration_t::QUARTERS); + case lexer_t::token_t::TOK_QUARTERS: when += gregorian::months(amount * 3 * adjust); break; - } case lexer_t::token_t::TOK_MONTH: case lexer_t::token_t::TOK_MONTHS: when += gregorian::months(amount * adjust); |