1 files changed, 4 insertions, 7 deletions
diff --git a/Swiften/EventLoop/EventLoop.cpp b/Swiften/EventLoop/EventLoop.cpp
index 186616f..f6af699 100644
--- a/Swiften/EventLoop/EventLoop.cpp
+++ b/Swiften/EventLoop/EventLoop.cpp
@@ -1,30 +1,25 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/EventLoop/EventLoop.h>
 
 #include <algorithm>
 #include <cassert>
 #include <vector>
 
-#include <boost/bind.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 #include <boost/optional.hpp>
 
 #include <Swiften/Base/Log.h>
 
-namespace lambda = boost::lambda;
-
 namespace Swift {
 
 inline void invokeCallback(const Event& event) {
     try {
         assert(!event.callback.empty());
         event.callback();
     }
     catch (const std::exception& e) {
         SWIFT_LOG(error) << "Uncaught exception in event loop: " << e.what() << std::endl;
@@ -90,13 +85,15 @@ void EventLoop::postEvent(boost::function<void ()> callback, std::shared_ptr<Eve
     }
 }
 
 void EventLoop::removeEventsFromOwner(std::shared_ptr<EventOwner> owner) {
     std::unique_lock<std::recursive_mutex> removeLock(removeEventsMutex_, std::defer_lock);
     std::unique_lock<std::recursive_mutex> eventsLock(eventsMutex_, std::defer_lock);
 
     std::lock(removeLock, eventsLock);
 
-    events_.remove_if(lambda::bind(&Event::owner, lambda::_1) == owner);
+    events_.remove_if([&](const Event& event) {
+        return event.owner == owner;
+    });
 }
 
 }