From 72527ce3b39674a3e72e505d555f76b87a19eea5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 17 Feb 2012 14:29:13 -0600 Subject: Fixes for variable shadowing (18/28) --- src/journal.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/journal.cc') 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; -- cgit v1.2.3