Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2018-05-07 18:48:01 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2018-05-07 18:48:01 (GMT) |
| commit | d9994a01bca43aab08fc67b789e71d28672c6ba1 (patch) | |
| tree | bd842012bd552b953af1f52cff893a032da3a4de /Swift/Controllers | |
| parent | e9f6129a4ce5db25bcb6de47be94ee89357713d0 (diff) | |
| download | swift-d9994a01bca43aab08fc67b789e71d28672c6ba1.zip swift-d9994a01bca43aab08fc67b789e71d28672c6ba1.tar.bz2 | |
Replace boost::lambda with C++11 lambdas
Test-Information:
Builds on macOS 10.13.4 with clang trunk. All unit and
integration tests pass. Produces fewer warnings with clang
trunk (previously reported marked-unused-but-used warnings).
Change-Id: I849d764537cfbc380155e87b033dc5e517b3c342
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/ContactSuggester.cpp | 11 |
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 @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2014-2016 Isode Limited. + * Copyright (c) 2014-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -19,16 +19,12 @@ #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() { @@ -60,8 +56,9 @@ std::vector<Contact::ref> ContactSuggester::getSuggestions(const std::string& se 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; |