ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shadowing variables

Browse Source
This commit is contained in:
seelabs
2019-08-13 14:26:02 -07:00
parent 014df67fed
commit b9e73b4852
55 changed files with 460 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -981,8 +981,8 @@ LedgerMaster::consensusBuilt(
// If we still don't know the sequence, get it
if (v.second.ledgerSeq_ == 0)
{
if (auto ledger = getLedgerByHash (v.first))
v.second.ledgerSeq_ = ledger->info().seq;
if (auto l = getLedgerByHash (v.first))
v.second.ledgerSeq_ = l->info().seq;
}
if (v.second.ledgerSeq_ > maxSeq)
@@ -1464,11 +1464,10 @@ LedgerMaster::walkHashBySeq (
// Try to acquire the complete ledger
if (!ledger)
{
auto const ledger = app_.getInboundLedgers().acquire (
*refHash, refIndex, InboundLedger::Reason::GENERIC);
if (ledger)
if (auto const l = app_.getInboundLedgers().acquire (
*refHash, refIndex, InboundLedger::Reason::GENERIC))
{
ledgerHash = hashOfSeq(*ledger, index, m_journal);
ledgerHash = hashOfSeq(*l, index, m_journal);
assert (ledgerHash);
}
}
@@ -1755,7 +1754,7 @@ void LedgerMaster::doAdvance (ScopedLockType& sl)
InboundLedger::Reason reason = InboundLedger::Reason::HISTORY;
boost::optional<std::uint32_t> missing;
{
ScopedLockType sl(mCompleteLock);
ScopedLockType sll(mCompleteLock);
missing = prevMissing(mCompleteLedgers,
mPubLedger->info().seq,
app_.getNodeStore().earliestSeq());