Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-05 21:22:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace std::bind for methods that use std::unique_ptr with a lambda

Browse source
This commit is contained in:
Ryan Huffman 2015-09-01 11:55:26 -07:00
parent 899b94eab3
commit 019d234ffd
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ice-server/src/IceServer.cpp
View file

@ -36,7 +36,7 @@ IceServer::IceServer(int argc, char* argv[]) :
// set processPacket as the verified packet callback for the udt::Socket
using std::placeholders::_1;
_serverSocket.setPacketHandler(std::bind(&IceServer::processPacket, this, _1));
_serverSocket.setPacketHandler([this](std::unique_ptr<udt::Packet> packet) { processPacket(std::move(packet)); });
// set packetVersionMatch as the verify packet operator for the udt::Socket
_serverSocket.setPacketFilterOperator(std::bind(&IceServer::packetVersionMatch, this, _1));

6
libraries/networking/src/LimitedNodeList.cpp
View file

@ -95,8 +95,8 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short
// set &PacketReceiver::handleVerifiedPacket as the verified packet callback for the udt::Socket
using std::placeholders::_1;
_nodeSocket.setPacketHandler(std::bind(&PacketReceiver::handleVerifiedPacket, _packetReceiver, _1));
_nodeSocket.setPacketListHandler(std::bind(&PacketReceiver::handleVerifiedPacketList, _packetReceiver, _1));
_nodeSocket.setPacketHandler([this](std::unique_ptr<udt::Packet> packet) { _packetReceiver->handleVerifiedPacket(std::move(packet)); });
_nodeSocket.setPacketListHandler([this](std::unique_ptr<udt::PacketList> packetList) { _packetReceiver->handleVerifiedPacketList(std::move(packetList)); });
// set our isPacketVerified method as the verify operator for the udt::Socket
_nodeSocket.setPacketFilterOperator(std::bind(&LimitedNodeList::isPacketVerified, this, _1));
@ -764,7 +764,7 @@ void LimitedNodeList::possiblyTimeoutSTUNAddressLookup() {
void LimitedNodeList::addSTUNHandlerToUnfiltered() {
// make ourselves the handler of STUN packets when they come in
using std::placeholders::_1;
_nodeSocket.addUnfilteredHandler(_stunSockAddr, std::bind(&LimitedNodeList::processSTUNResponse, this, _1));
_nodeSocket.addUnfilteredHandler(_stunSockAddr, [this](std::unique_ptr<udt::BasePacket> packet) { processSTUNResponse(std::move(packet)); });
}
void LimitedNodeList::stopInitialSTUNUpdate(bool success) {

2
tools/udt-test/src/UDTTest.cpp
View file

@ -177,7 +177,7 @@ UDTTest::UDTTest(int& argc, char** argv) :
// this is a receiver - in case there are ordered packets (messages) being sent to us make sure that we handle them
// so that they can be verified
using std::placeholders::_1;
_socket.setPacketListHandler(std::bind(&UDTTest::handlePacketList, this, _1));
_socket.setPacketListHandler([this](std::unique_ptr<udt::PacketList> packetList) { handlePacketList(std::move(packetList)); });
}
// the sender reports stats every 100 milliseconds, unless passed a custom value