1 files changed, 4 insertions, 7 deletions
diff --git a/Swift/Controllers/ContactSuggester.cpp b/Swift/Controllers/ContactSuggester.cpp
index eb27ed4..4b621db 100644
--- a/Swift/Controllers/ContactSuggester.cpp
+++ b/Swift/Controllers/ContactSuggester.cpp
@@ -1,40 +1,36 @@
 /*
  * Copyright (c) 2013 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/ContactSuggester.h>
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/find.hpp>
 #include <boost/bind.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 
 #include <Swiften/Base/Algorithm.h>
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/ContactProvider.h>
 
-namespace lambda = boost::lambda;
-
 namespace Swift {
 
 ContactSuggester::ContactSuggester() {
 }
 
 ContactSuggester::~ContactSuggester() {
 }
 
 void ContactSuggester::addContactProvider(ContactProvider* provider) {
@@ -54,20 +50,21 @@ bool ContactSuggester::matchContact(const std::string& search, const Contact::re
 std::vector<Contact::ref> ContactSuggester::getSuggestions(const std::string& search, bool withMUCNicks) const {
     std::vector<Contact::ref> results;
 
     for (auto provider : contactProviders_) {
         append(results, provider->getContacts(withMUCNicks));
     }
 
     std::sort(results.begin(), results.end(), Contact::lexicographicalSortPredicate);
     results.erase(std::unique(results.begin(), results.end(), Contact::equalityPredicate), results.end());
-    results.erase(std::remove_if(results.begin(), results.end(), !lambda::bind(&matchContact, search, lambda::_1)),
-        results.end());
+    results.erase(std::remove_if(results.begin(), results.end(), [&](const Contact::ref contact) {
+        return !matchContact(search, contact);
+    }), results.end());
     std::sort(results.begin(), results.end(), boost::bind(&Contact::sortPredicate, _1, _2, search));
 
     return results;
 }
 
 bool ContactSuggester::fuzzyMatch(std::string text, std::string match) {
     std::string lowerText = text;
     boost::algorithm::to_lower(lowerText);
     std::string lowerMatch = match;