ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade ripple-lib. Fix OS X warnings

Browse Source
This commit is contained in:
Miguel Portilla
2015-09-24 15:44:28 -04:00
parent 5bbb89753d
commit c7b3153958
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -16,7 +16,7 @@
"lodash": "^3.5.0", "lodash": "^3.5.0",
"mocha": "^2.1.0", "mocha": "^2.1.0",
"request": "^2.47.0", "request": "^2.47.0",
"ripple-lib": "0.13.0-rc6", "ripple-lib": "0.13.0-rc6.0",
"simple-jsonrpc": "~0.0.2" "simple-jsonrpc": "~0.0.2"
}, },
"scripts": { "scripts": {

7
src/ripple/app/ledger/impl/LedgerMaster.cpp
View File

@@ -313,7 +313,7 @@ public:
mHeldTransactions.insert (transaction->getSTransaction ()); mHeldTransactions.insert (transaction->getSTransaction ());
} }
void switchLCL (Ledger::pointer lastClosed) void switchLCL (Ledger::pointer lastClosed) override
{ {
assert (lastClosed); assert (lastClosed);
@@ -336,7 +336,8 @@ public:
} }
} }
bool fixIndex (LedgerIndex ledgerIndex, LedgerHash const& ledgerHash) bool
fixIndex (LedgerIndex ledgerIndex, LedgerHash const& ledgerHash) override
{ {
return mLedgerHistory.fixIndex (ledgerIndex, ledgerHash); return mLedgerHistory.fixIndex (ledgerIndex, ledgerHash);
} }
@@ -1283,7 +1284,7 @@ public:
} }
// The current ledger is the ledger we believe new transactions should go in // The current ledger is the ledger we believe new transactions should go in
std::shared_ptr<ReadView const> getCurrentLedger () std::shared_ptr<ReadView const> getCurrentLedger () override
{ {
return app_.openLedger().current(); return app_.openLedger().current();
} }