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

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source 
Conflicts:
	src/LedgerAcquire.cpp
	src/Suppression.cpp
This commit is contained in:
jed
2012-06-19 04:58:08 -07:00
parent d9a930596b 12dffac101
commit 96e7bf21b3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/LedgerAcquire.cpp
View File

@@ -254,7 +254,7 @@ void PeerSet::sendRequest(const newcoin::TMGetLedger& tmGL)
while (it != mPeers.end())
{
if (it->expired())
it=mPeers.erase(it);
it = mPeers.erase(it);
else
{
// FIXME: Track last peer sent to and time sent

4
src/Suppression.cpp
View File

@@ -15,10 +15,10 @@ bool SuppressionTable::addSuppression(const uint160& suppression)
{
if ((it->first + mHoldTime) < now)
{
for (std::list<uint160>::iterator lit = it->second.begin(), end = it->second.end();
for (std::list<uint160>::iterator lit = it->second.begin(), end = it->second.end();
lit != end; ++lit)
mSuppressionMap.erase(*lit);
it=mSuppressionTimes.erase(it);
it = mSuppressionTimes.erase(it);
}
else ++it;
}