summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2012-02-17 14:29:13 -0600
committerJohn Wiegley <johnw@newartisans.com>2012-02-17 15:06:18 -0600
commit72527ce3b39674a3e72e505d555f76b87a19eea5 (patch)
tree586b105c8f90c9cd41d0c75269dbb60386189bf3 /src
parent87b5f6ec50e3d4d5cda4afbb8b6caf54d0ee5863 (diff)
downloadfork-ledger-72527ce3b39674a3e72e505d555f76b87a19eea5.tar.gz
fork-ledger-72527ce3b39674a3e72e505d555f76b87a19eea5.tar.bz2
fork-ledger-72527ce3b39674a3e72e505d555f76b87a19eea5.zip
Fixes for variable shadowing (18/28)
Diffstat (limited to 'src')
-rw-r--r--src/journal.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal.cc b/src/journal.cc
index 2a9adeeb..0691954f 100644
--- a/src/journal.cc
+++ b/src/journal.cc
@@ -178,7 +178,7 @@ std::size_t journal_t::read(std::istream& in,
}
std::size_t journal_t::read(const path& pathname,
- account_t * master,
+ account_t * master_account,
scope_t * scope)
{
path filename = resolve_path(pathname);
@@ -188,7 +188,7 @@ std::size_t journal_t::read(const path& pathname,
_("Cannot read journal file '%1'") << filename);
ifstream stream(filename);
- std::size_t count = read(stream, filename, master, scope);
+ std::size_t count = read(stream, filename, master_account, scope);
if (count > 0)
sources.push_back(fileinfo_t(filename));
return count;