diff --git a/src/ConnectionPool.cpp b/src/ConnectionPool.cpp index 90bae25ebc..6e7302586b 100644 --- a/src/ConnectionPool.cpp +++ b/src/ConnectionPool.cpp @@ -352,9 +352,7 @@ void ConnectionPool::peerDisconnected(Peer::pointer peer, const ipPort& ipPeer, if (naPeer.isValid()) { - boost::unordered_map::iterator itCm; - - itCm = mConnectedMap.find(naPeer); + boost::unordered_map::iterator itCm = mConnectedMap.find(naPeer); if (itCm == mConnectedMap.end()) { @@ -369,9 +367,7 @@ void ConnectionPool::peerDisconnected(Peer::pointer peer, const ipPort& ipPeer, } } - boost::unordered_map::iterator itIp; - - itIp = mIpMap.find(ipPeer); + boost::unordered_map::iterator itIp = mIpMap.find(ipPeer); if (itIp == mIpMap.end()) { diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp index a94c0e0302..92e849b18d 100644 --- a/src/LedgerAcquire.cpp +++ b/src/LedgerAcquire.cpp @@ -370,10 +370,10 @@ bool LedgerAcquireMaster::hasLedger(const uint256& hash) return mLedgers.find(hash) != mLedgers.end(); } -bool LedgerAcquireMaster::dropLedger(const uint256& hash) +void LedgerAcquireMaster::dropLedger(const uint256& hash) { boost::mutex::scoped_lock sl(mLock); - return mLedgers.erase(hash); + mLedgers.erase(hash); } bool LedgerAcquireMaster::gotLedgerData(newcoin::TMLedgerData& packet, Peer::pointer peer) diff --git a/src/LedgerAcquire.h b/src/LedgerAcquire.h index 211567d320..681d4bd0e0 100644 --- a/src/LedgerAcquire.h +++ b/src/LedgerAcquire.h @@ -128,7 +128,7 @@ public: LedgerAcquire::pointer findCreate(const uint256& hash); LedgerAcquire::pointer find(const uint256& hash); bool hasLedger(const uint256& ledgerHash); - bool dropLedger(const uint256& ledgerHash); + void dropLedger(const uint256& ledgerHash); bool gotLedgerData(newcoin::TMLedgerData& packet, Peer::pointer); };