From a7ea0a4f7899ce7365cdc293089641ac2b39dfb8 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 8 Mar 2017 10:13:16 +0100
Subject: Use standard algorithm instead of custom code

Test-Information:

Builds on macOS 10.12.3 and unit tests pass. Roster filtering
still works and does not crash in an ASAN-enabled build.

Change-Id: I545a582b003cd0c15dff43b73b0922dcbf4055af

diff --git a/Swift/Controllers/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index 68297a4..9c9b9e3 100644
--- a/Swift/Controllers/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -6,6 +6,7 @@
 
 #include <Swift/Controllers/Roster/Roster.h>
 
+#include <algorithm>
 #include <deque>
 #include <memory>
 #include <set>
@@ -222,12 +223,7 @@ void Roster::addFilter(RosterFilter* filter) {
 }
 
 void Roster::removeFilter(RosterFilter* filter) {
-    for (unsigned int i = 0; i < filters_.size(); i++) {
-        if (filters_[i] == filter) {
-            filters_.erase(filters_.begin() + i);
-            break;
-        }
-    }
+    filters_.erase(std::remove(filters_.begin(), filters_.end(), filter), filters_.end());
     filterAll();
     onFilterRemoved(filter);
 }
-- 
cgit v0.10.2-6-g49f6