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 /Swiften/Parser/Tree | |
| 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 'Swiften/Parser/Tree')
| -rw-r--r-- | Swiften/Parser/Tree/ParserElement.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Swiften/Parser/Tree/ParserElement.cpp b/Swiften/Parser/Tree/ParserElement.cpp index 5415945..988bc13 100644 --- a/Swiften/Parser/Tree/ParserElement.cpp +++ b/Swiften/Parser/Tree/ParserElement.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016 Isode Limited. + * Copyright (c) 2011-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -7,13 +7,8 @@ #include <Swiften/Parser/Tree/ParserElement.h> -#include <boost/lambda/bind.hpp> -#include <boost/lambda/lambda.hpp> - #include <Swiften/Parser/Tree/NullParserElement.h> -namespace lambda = boost::lambda; - namespace Swift { ParserElement::ParserElement(const std::string& name, const std::string& xmlns, const AttributeMap& attributes) : name_(name), xmlns_(xmlns), attributes_(attributes) { @@ -34,8 +29,9 @@ void ParserElement::appendCharacterData(const std::string& data) { std::vector<ParserElement::ref> ParserElement::getChildren(const std::string& name, const std::string& xmlns) const { std::vector<ParserElement::ref> result; - std::remove_copy_if(children_.begin(), children_.end(), std::back_inserter(result), - lambda::bind(&ParserElement::getName, *lambda::_1) != name || lambda::bind(&ParserElement::getNamespace, *lambda::_1) != xmlns); + std::remove_copy_if(children_.begin(), children_.end(), std::back_inserter(result), [&](const ParserElement::ref& element) { + return (element->getName() != name) || (element->getNamespace() != xmlns); + }); return result; } |