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

@@ -230,7 +230,7 @@ public:
STAmount saOutAct; // Amount actually sent (calc output).
PathState(
const Ledger::pointer& lpLedger,
Ledger::ref lpLedger,
const int iIndex,
const LedgerEntrySet& lesSource,
const STPath& spSourcePath,
@@ -243,7 +243,7 @@ public:
Json::Value getJson() const;
static PathState::pointer createPathState(
const Ledger::pointer& lpLedger,
Ledger::ref lpLedger,
const int iIndex,
const LedgerEntrySet& lesSource,
const STPath& spSourcePath,
@@ -382,10 +382,10 @@ protected:
public:
TransactionEngine() { ; }
TransactionEngine(const Ledger::pointer& ledger) : mLedger(ledger) { assert(mLedger); }
TransactionEngine(Ledger::ref ledger) : mLedger(ledger) { assert(mLedger); }
Ledger::pointer getLedger() { return mLedger; }
void setLedger(const Ledger::pointer& ledger) { assert(ledger); mLedger = ledger; }
Ledger::pointer getLedger() { return mLedger; }
void setLedger(Ledger::ref ledger) { assert(ledger); mLedger = ledger; }
TER applyTransaction(const SerializedTransaction&, TransactionEngineParams);
};