summaryrefslogtreecommitdiff
path: root/src/session.h
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-10-29 00:55:01 -0400
committerJohn Wiegley <johnw@newartisans.com>2009-10-29 00:55:01 -0400
commit0b6460d0629a23b798d91215bffe059229ebe5ce (patch)
tree57397e284628ad0a219d3c4948482a756ba19a3b /src/session.h
parent2b3f3e9867431174f5b5b25e47098a7218213a82 (diff)
parent55f5868380a4917028365256abcfd6d0b5f0a1e4 (diff)
downloadfork-ledger-0b6460d0629a23b798d91215bffe059229ebe5ce.tar.gz
fork-ledger-0b6460d0629a23b798d91215bffe059229ebe5ce.tar.bz2
fork-ledger-0b6460d0629a23b798d91215bffe059229ebe5ce.zip
Merge branch 'next'
Diffstat (limited to 'src/session.h')
-rw-r--r--src/session.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/session.h b/src/session.h
index a51cdba6..4955053d 100644
--- a/src/session.h
+++ b/src/session.h
@@ -84,9 +84,11 @@ public:
std::size_t read_journal(std::istream& in,
const path& pathname,
- account_t * master = NULL);
+ account_t * master = NULL,
+ scope_t * scope = NULL);
std::size_t read_journal(const path& pathname,
- account_t * master = NULL);
+ account_t * master = NULL,
+ scope_t * scope = NULL);
std::size_t read_data(const string& master_account = "");