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 /Sluift | |
| 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 'Sluift')
| -rw-r--r-- | Sluift/client.cpp | 9 | ||||
| -rw-r--r-- | Sluift/component.cpp | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/Sluift/client.cpp b/Sluift/client.cpp index ae2f610..ec208bc 100644 --- a/Sluift/client.cpp +++ b/Sluift/client.cpp @@ -1,12 +1,10 @@ /* - * Copyright (c) 2013-2017 Isode Limited. + * Copyright (c) 2013-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <boost/assign/list_of.hpp> -#include <boost/lambda/bind.hpp> -#include <boost/lambda/lambda.hpp> #include <Swiften/Base/IDGenerator.h> #include <Swiften/Disco/ClientDiscoManager.h> @@ -42,7 +40,6 @@ #include <Sluift/globals.h> using namespace Swift; -namespace lambda = boost::lambda; static inline SluiftClient* getClient(lua_State* L) { return *Lua::checkUserData<SluiftClient>(L, 1); @@ -659,7 +656,9 @@ SLUIFT_LUA_FUNCTION(Client, get_next_event) { } else if (type) { event = client->getNextEvent( - timeout, lambda::bind(&SluiftClient::Event::type, lambda::_1) == *type); + timeout, [&](const SluiftClient::Event& event) { + return event.type == *type; + }); } else { event = client->getNextEvent(timeout); diff --git a/Sluift/component.cpp b/Sluift/component.cpp index df96d43..f3c2e37 100644 --- a/Sluift/component.cpp +++ b/Sluift/component.cpp @@ -1,12 +1,10 @@ /* - * Copyright (c) 2014-2016 Isode Limited. + * Copyright (c) 2014-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <boost/assign/list_of.hpp> -#include <boost/lambda/bind.hpp> -#include <boost/lambda/lambda.hpp> #include <Swiften/Base/IDGenerator.h> #include <Swiften/Elements/DiscoInfo.h> @@ -41,7 +39,6 @@ #include <Sluift/globals.h> using namespace Swift; -namespace lambda = boost::lambda; static inline SluiftComponent* getComponent(lua_State* L) { return *Lua::checkUserData<SluiftComponent>(L, 1); @@ -433,7 +430,9 @@ SLUIFT_LUA_FUNCTION(Component, get_next_event) { } else if (type) { event = component->getNextEvent( - timeout, lambda::bind(&SluiftComponent::Event::type, lambda::_1) == *type); + timeout, [&](const SluiftComponent::Event& event) { + return event.type == *type; + }); } else { event = component->getNextEvent(timeout); |