summaryrefslogtreecommitdiff
path: root/src/journal.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-11-20 21:33:23 -0500
committerJohn Wiegley <johnw@newartisans.com>2009-11-20 21:33:23 -0500
commit117dddabd4f883de4f464821f9567d889a6fa449 (patch)
tree602c8c5e72b81ffc9bcf01bbaed5e2875d0e60a0 /src/journal.cc
parentcc9110a43a1e2d006de8d24a84bbfb2c6918cf33 (diff)
parent4e6ec09e4d2a69dcb06627e44512980b09561448 (diff)
downloadfork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.tar.gz
fork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.tar.bz2
fork-ledger-117dddabd4f883de4f464821f9567d889a6fa449.zip
Merge branch 'next'
Diffstat (limited to 'src/journal.cc')
-rw-r--r--src/journal.cc16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/journal.cc b/src/journal.cc
index 2366ce30..6ebccd66 100644
--- a/src/journal.cc
+++ b/src/journal.cc
@@ -77,7 +77,6 @@ journal_t::~journal_t()
checked_delete(xact);
checked_delete(master);
- commodity_pool.reset();
}
void journal_t::initialize()
@@ -85,21 +84,6 @@ void journal_t::initialize()
master = new account_t;
bucket = NULL;
was_loaded = false;
-
- commodity_pool.reset(new commodity_pool_t);
-
- // Add time commodity conversions, so that timelog's may be parsed
- // in terms of seconds, but reported as minutes or hours.
- if (commodity_t * commodity = commodity_pool->create("s"))
- commodity->add_flags(COMMODITY_BUILTIN | COMMODITY_NOMARKET);
- else
- assert(false);
-
- // Add a "percentile" commodity
- if (commodity_t * commodity = commodity_pool->create("%"))
- commodity->add_flags(COMMODITY_BUILTIN | COMMODITY_NOMARKET);
- else
- assert(false);
}
void journal_t::add_account(account_t * acct)