diff options
author | Craig Earls <enderw88@gmail.com> | 2015-02-25 22:01:33 -0700 |
---|---|---|
committer | Craig Earls <enderw88@gmail.com> | 2015-02-25 22:01:33 -0700 |
commit | 1f803d629491991afb8aa9cd1d159313b2af78c7 (patch) | |
tree | 4eb6f0f90162f4808d0687a06ad1a698eb3ed035 /src/session.cc | |
parent | fe48f607be7b9da8d2c4ac1fb30078dea55b8240 (diff) | |
parent | af0da737fc4ef8f9ccebd3d43519610b8a8fcaa1 (diff) | |
download | fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.tar.gz fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.tar.bz2 fork-ledger-1f803d629491991afb8aa9cd1d159313b2af78c7.zip |
Merge commit 'af0da737fc4ef8f9ccebd3d43519610b8a8fcaa1' into next
Conflicts:
lisp/ledger-reconcile.el
Diffstat (limited to 'src/session.cc')
-rw-r--r-- | src/session.cc | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/session.cc b/src/session.cc index b0d31be9..7736023d 100644 --- a/src/session.cc +++ b/src/session.cc @@ -37,7 +37,6 @@ #include "journal.h" #include "iterators.h" #include "filters.h" -#include "archive.h" namespace ledger { @@ -128,16 +127,6 @@ std::size_t session_t::read_data(const string& master_account) if (HANDLED(value_expr_)) journal->value_expr = HANDLER(value_expr_).str(); - -#if HAVE_BOOST_SERIALIZATION - optional<archive_t> cache; - if (HANDLED(cache_) && master_account.empty()) - cache = archive_t(HANDLED(cache_).str()); - - if (! (cache && - cache->should_load(HANDLER(file_).data_files) && - cache->load(*journal.get()))) { -#endif // HAVE_BOOST_SERIALIZATION if (price_db_path) { if (exists(*price_db_path)) { parsing_context.push(*price_db_path); @@ -191,12 +180,6 @@ std::size_t session_t::read_data(const string& master_account) << "] == journal->xacts.size() [" << journal->xacts.size() << "]"); assert(xact_count == journal->xacts.size()); -#if HAVE_BOOST_SERIALIZATION - if (cache && cache->should_save(*journal.get())) - cache->save(*journal.get()); - } -#endif // HAVE_BOOST_SERIALIZATION - if (populated_data_files) HANDLER(file_).data_files.clear(); @@ -333,8 +316,7 @@ option_t<session_t> * session_t::lookup_option(const char * p) OPT_CH(price_exp_); break; case 'c': - OPT(cache_); - else OPT(check_payees); + OPT(check_payees); break; case 'd': OPT(download); // -Q |