diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-10-31 00:55:56 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-10-31 00:55:56 -0400 |
| commit | a2cb549b1dff9024e3f700203e424e496b25fd91 (patch) | |
| tree | 1c03e9eb6f649a1446021dfb2a5d93a697f81feb /src/global.cc | |
| parent | 349fc5d175bc5c4acbc478b4d78c12dc507c4f58 (diff) | |
| parent | a88a4c55b2b11d58d3b9e49bf785be42afe63510 (diff) | |
| download | ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.tar.gz ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.tar.bz2 ledger-a2cb549b1dff9024e3f700203e424e496b25fd91.zip | |
Merge branch 'next'
Diffstat (limited to 'src/global.cc')
| -rw-r--r-- | src/global.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/global.cc b/src/global.cc index 8204bf69..9ba2a357 100644 --- a/src/global.cc +++ b/src/global.cc @@ -435,17 +435,18 @@ void global_scope_t::normalize_report_options(const string& verb) item_t::use_effective_date = (rep.HANDLED(effective) && ! rep.HANDLED(actual_dates)); - rep.session.commodity_pool->keep_base = rep.HANDLED(base); - rep.session.commodity_pool->get_quotes = rep.session.HANDLED(download); + rep.session.journal->commodity_pool->keep_base = rep.HANDLED(base); + rep.session.journal->commodity_pool->get_quotes = rep.session.HANDLED(download); if (rep.session.HANDLED(price_exp_)) - rep.session.commodity_pool->quote_leeway = + rep.session.journal->commodity_pool->quote_leeway = rep.session.HANDLER(price_exp_).value.as_long(); if (rep.session.HANDLED(price_db_)) - rep.session.commodity_pool->price_db = rep.session.HANDLER(price_db_).str(); + rep.session.journal->commodity_pool->price_db = + rep.session.HANDLER(price_db_).str(); else - rep.session.commodity_pool->price_db = none; + rep.session.journal->commodity_pool->price_db = none; if (rep.HANDLED(date_format_)) set_date_format(rep.HANDLER(date_format_).str().c_str()); @@ -542,7 +543,8 @@ void global_scope_t::normalize_report_options(const string& verb) if (! rep.HANDLER(date_width_).specified) rep.HANDLER(date_width_) - .on_with(none, format_date(CURRENT_DATE(), FMT_PRINTED).length()); + .on_with(none, static_cast<long>(format_date(CURRENT_DATE(), + FMT_PRINTED).length())); long date_width = rep.HANDLER(date_width_).value.to_long(); long payee_width = (rep.HANDLER(payee_width_).specified ? |