diff options
author | John Wiegley <johnw@newartisans.com> | 2010-06-13 00:42:25 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2010-06-13 00:42:25 -0400 |
commit | 40f553228f5a28034c6635fdcb4c86af28a385ed (patch) | |
tree | 2c40305c9f9841a4c3d453a4a5c49ec69056b4b2 /src/journal.cc | |
parent | 556211e623cad88213e5087b5c9c36e754d9aa02 (diff) | |
parent | b1b4e2aadff5983d443d70c09ea86a41b015873f (diff) | |
download | fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.tar.gz fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.tar.bz2 fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.zip |
Merge branch 'next'
Diffstat (limited to 'src/journal.cc')
-rw-r--r-- | src/journal.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/journal.cc b/src/journal.cc index 158fac42..fd6d3eac 100644 --- a/src/journal.cc +++ b/src/journal.cc @@ -145,9 +145,9 @@ bool journal_t::remove_xact(xact_t * xact) } std::size_t journal_t::read(std::istream& in, - const path& pathname, - account_t * master_alt, - scope_t * scope) + const path& pathname, + account_t * master_alt, + scope_t * scope) { std::size_t count = 0; try { @@ -156,13 +156,13 @@ std::size_t journal_t::read(std::istream& in, if (! scope) throw_(std::runtime_error, - _("No default scope in which to read journal file '%1'") - << pathname); + _("No default scope in which to read journal file '%1'") + << pathname); value_t strict = expr_t("strict").calc(*scope); count = parse(in, *scope, master_alt ? master_alt : master, - &pathname, strict.to_boolean()); + &pathname, strict.to_boolean()); } catch (...) { clear_xdata(); @@ -178,14 +178,14 @@ std::size_t journal_t::read(std::istream& in, } std::size_t journal_t::read(const path& pathname, - account_t * master, - scope_t * scope) + account_t * master, + scope_t * scope) { path filename = resolve_path(pathname); if (! exists(filename)) throw_(std::runtime_error, - _("Cannot read journal file '%1'") << filename); + _("Cannot read journal file '%1'") << filename); ifstream stream(filename); std::size_t count = read(stream, filename, master, scope); |