Merge branch 'master' into ripple

This commit is contained in:
Arthur Britto
2012-09-04 16:16:13 -07:00
44 changed files with 483 additions and 396 deletions

View File

@@ -840,8 +840,8 @@ bool STAmount::applyOffer(
saTakerPaid = saTakerFunds; // Taker paid all he had.
saTakerGot = divide(multiply(saTakerFunds, saOfferPaysAvailable, CURRENCY_ONE, ACCOUNT_ONE), saOfferGetsAvailable, saOfferPays.getCurrency(), saOfferPays.getIssuer());
Log(lsINFO) << "applyOffer: saTakerGot=" << saTakerGot.getFullText();
Log(lsINFO) << "applyOffer: saOfferPaysAvailable=" << saOfferPaysAvailable.getFullText();
Log(lsINFO) << "applyOffer: saTakerGot=" << saTakerGot;
Log(lsINFO) << "applyOffer: saOfferPaysAvailable=" << saOfferPaysAvailable;
}
return saTakerGot >= saOfferPays;