1 files changed, 10 insertions, 10 deletions
diff --git a/Swiften/Parser/AttributeMap.cpp b/Swiften/Parser/AttributeMap.cpp
index c112d52..f6767de 100644
--- a/Swiften/Parser/AttributeMap.cpp
+++ b/Swiften/Parser/AttributeMap.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.
  */
@@ -8,19 +8,17 @@
 
 #include <algorithm>
 
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 #include <boost/optional.hpp>
 
 using namespace Swift;
-namespace lambda = boost::lambda;
 
 AttributeMap::AttributeMap() {
 }
 
 std::string AttributeMap::getAttribute(const std::string& attribute, const std::string& ns) const {
-    AttributeValueMap::const_iterator i = std::find_if(attributes.begin(), attributes.end(),
-            lambda::bind(&AttributeMap::Entry::getAttribute, lambda::_1) == Attribute(attribute, ns));
+    const auto i = std::find_if(attributes.begin(), attributes.end(), [&](const Entry& entry) {
+        return entry.getAttribute() == Attribute(attribute, ns);
+    });
     if (i == attributes.end()) {
         return "";
     }
@@ -30,8 +28,9 @@ std::string AttributeMap::getAttribute(const std::string& attribute, const std::
 }
 
 bool AttributeMap::getBoolAttribute(const std::string& attribute, bool defaultValue) const {
-    AttributeValueMap::const_iterator i = std::find_if(attributes.begin(), attributes.end(),
-            lambda::bind(&AttributeMap::Entry::getAttribute, lambda::_1) == Attribute(attribute, ""));
+    const auto i = std::find_if(attributes.begin(), attributes.end(), [&](const Entry& entry) {
+        return entry.getAttribute() == Attribute(attribute, "");
+    });
     if (i == attributes.end()) {
         return defaultValue;
     }
@@ -41,8 +40,9 @@ bool AttributeMap::getBoolAttribute(const std::string& attribute, bool defaultVa
 }
 
 boost::optional<std::string> AttributeMap::getAttributeValue(const std::string& attribute) const {
-    AttributeValueMap::const_iterator i = std::find_if(attributes.begin(), attributes.end(),
-            lambda::bind(&AttributeMap::Entry::getAttribute, lambda::_1) == Attribute(attribute, ""));
+    const auto i = std::find_if(attributes.begin(), attributes.end(), [&](const Entry& entry) {
+        return entry.getAttribute() == Attribute(attribute, "");
+    });
     if (i == attributes.end()) {
         return boost::optional<std::string>();
     }