From fbc73e20784b055485f676096e758d6aeed62e0c Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Sat, 1 Nov 2014 18:17:04 +0100
Subject: Add stdalgo::erase() and use it to simplify code

---
 src/logger.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/logger.cpp')

diff --git a/src/logger.cpp b/src/logger.cpp
index bf4ef582a..61f1eb179 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -207,10 +207,9 @@ void LogManager::DelLogStream(LogStream* l)
 {
 	for (std::map<std::string, std::vector<LogStream*> >::iterator i = LogStreams.begin(); i != LogStreams.end(); ++i)
 	{
-		std::vector<LogStream*>::iterator it;
-		while ((it = std::find(i->second.begin(), i->second.end(), l)) != i->second.end())
+		while (stdalgo::erase(i->second, l))
 		{
-			i->second.erase(it);
+			// Keep erasing while it exists
 		}
 	}
 
@@ -236,11 +235,8 @@ bool LogManager::DelLogType(const std::string &type, LogStream *l)
 
 	if (i != LogStreams.end())
 	{
-		std::vector<LogStream *>::iterator it = std::find(i->second.begin(), i->second.end(), l);
-
-		if (it != i->second.end())
+		if (stdalgo::erase(i->second, l))
 		{
-			i->second.erase(it);
 			if (i->second.size() == 0)
 			{
 				LogStreams.erase(i);
-- 
cgit v1.3.1-10-gc9f91