Fixes for variable shadowing (22/28)

This commit is contained in:
John Wiegley 2012-02-17 14:29:54 -06:00
parent 6a9743d833
commit 31738bddff

View file

@ -126,29 +126,29 @@ namespace {
out << " "; out << " ";
std::ostringstream buf; std::ostringstream pbuf;
if (xact.state() == item_t::UNCLEARED) if (xact.state() == item_t::UNCLEARED)
buf << (post->state() == item_t::CLEARED ? "* " : pbuf << (post->state() == item_t::CLEARED ? "* " :
(post->state() == item_t::PENDING ? "! " : "")); (post->state() == item_t::PENDING ? "! " : ""));
if (post->has_flags(POST_VIRTUAL)) { if (post->has_flags(POST_VIRTUAL)) {
if (post->has_flags(POST_MUST_BALANCE)) if (post->has_flags(POST_MUST_BALANCE))
buf << '['; pbuf << '[';
else else
buf << '('; pbuf << '(';
} }
buf << post->account->fullname(); pbuf << post->account->fullname();
if (post->has_flags(POST_VIRTUAL)) { if (post->has_flags(POST_VIRTUAL)) {
if (post->has_flags(POST_MUST_BALANCE)) if (post->has_flags(POST_MUST_BALANCE))
buf << ']'; pbuf << ']';
else else
buf << ')'; pbuf << ')';
} }
unistring name(buf.str()); unistring name(pbuf.str());
std::size_t account_width = std::size_t account_width =
(report.HANDLER(account_width_).specified ? (report.HANDLER(account_width_).specified ?
@ -208,7 +208,7 @@ namespace {
account_width += unistring(trailer).length(); account_width += unistring(trailer).length();
} else { } else {
out << buf.str(); out << pbuf.str();
} }
if (post->note) if (post->note)