From 3005d46b1246d75021fad5475367d591ea7ba0ac Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Sat, 1 Sep 2012 01:01:28 -0700
Subject: [PATCH] Cleanup.

---
 src/Suppression.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Suppression.cpp b/src/Suppression.cpp
index c285d5f349..4b7cad5711 100644
--- a/src/Suppression.cpp
+++ b/src/Suppression.cpp
@@ -1,6 +1,7 @@
-
 #include "Suppression.h"
 
+#include <boost/foreach.hpp>
+
 bool SuppressionTable::addSuppression(const uint160& suppression)
 {
 	boost::mutex::scoped_lock sl(mSuppressionMutex);
@@ -9,15 +10,16 @@ bool SuppressionTable::addSuppression(const uint160& suppression)
 		return false;
 
 	time_t now = time(NULL);
+	time_t expireTime = now - mHoldTime;
 
-	boost::unordered_map< time_t, std::list<uint160> >::iterator it = mSuppressionTimes.begin();
-	while (it != mSuppressionTimes.end())
+	boost::unordered_map< time_t, std::list<uint160> >::iterator
+		it = mSuppressionTimes.begin(), end = mSuppressionTimes.end();
+	while (it != end)
 	{
-		if ((it->first + mHoldTime) < now)
+		if (it->first <= expireTime)
 		{
-			for (std::list<uint160>::iterator lit = it->second.begin(), end = it->second.end();
-					lit != end; ++lit)
-				mSuppressionMap.erase(*lit);
+			BOOST_FOREACH(const uint160& lit, it->second)
+				mSuppressionMap.erase(lit);
 			it = mSuppressionTimes.erase(it);
 		}
 		else ++it;