Fixes for variable shadowing (18/28)

This commit is contained in:
John Wiegley 2012-02-17 14:29:13 -06:00
parent 87b5f6ec50
commit 72527ce3b3

View file

@ -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;