Fixes for variable shadowing (3/28)

This commit is contained in:
John Wiegley 2012-02-17 14:26:16 -06:00
parent a3c9cc02d7
commit f9613fe1de

View file

@ -705,21 +705,21 @@ void amount_t::in_place_unreduce()
if (! quantity) if (! quantity)
throw_(amount_error, _("Cannot unreduce an uninitialized amount")); throw_(amount_error, _("Cannot unreduce an uninitialized amount"));
amount_t temp = *this; amount_t tmp = *this;
commodity_t * comm = commodity_; commodity_t * comm = commodity_;
bool shifted = false; bool shifted = false;
while (comm && comm->larger()) { while (comm && comm->larger()) {
amount_t next_temp = temp / comm->larger()->number(); amount_t next_temp = tmp / comm->larger()->number();
if (next_temp.abs() < amount_t(1L)) if (next_temp.abs() < amount_t(1L))
break; break;
temp = next_temp; tmp = next_temp;
comm = comm->larger()->commodity_; comm = comm->larger()->commodity_;
shifted = true; shifted = true;
} }
if (shifted) { if (shifted) {
*this = temp; *this = tmp;
commodity_ = comm; commodity_ = comm;
} }
} }