From b73d30721032d4cc166ec01c0b489d2e18d77e63 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 1 Sep 2015 12:23:24 -0700
Subject: [PATCH] Move std::placeholders::_1 to where they are used

---
 ice-server/src/IceServer.cpp                 | 2 +-
 libraries/networking/src/LimitedNodeList.cpp | 3 +--
 tools/udt-test/src/UDTTest.cpp               | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index a44b6393de..a6a28caa23 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -35,10 +35,10 @@ IceServer::IceServer(int argc, char* argv[]) :
     _serverSocket.bind(QHostAddress::AnyIPv4, ICE_SERVER_DEFAULT_PORT);
 
     // set processPacket as the verified packet callback for the udt::Socket
-    using std::placeholders::_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
+    using std::placeholders::_1;
     _serverSocket.setPacketFilterOperator(std::bind(&IceServer::packetVersionMatch, this, _1));
 
     // setup our timer to clear inactive peers
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 4e197a3ee4..e0b35b5773 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -94,7 +94,6 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short
     updateLocalSockAddr();
     
     // set &PacketReceiver::handleVerifiedPacket as the verified packet callback for the udt::Socket
-    using std::placeholders::_1;
     _nodeSocket.setPacketHandler(
         [this](std::unique_ptr<udt::Packet> packet) {
             _packetReceiver->handleVerifiedPacket(std::move(packet));
@@ -107,6 +106,7 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short
     );
 
     // set our isPacketVerified method as the verify operator for the udt::Socket
+    using std::placeholders::_1;
     _nodeSocket.setPacketFilterOperator(std::bind(&LimitedNodeList::isPacketVerified, this, _1));
     
     _packetStatTimer.start();
@@ -771,7 +771,6 @@ void LimitedNodeList::possiblyTimeoutSTUNAddressLookup() {
 
 void LimitedNodeList::addSTUNHandlerToUnfiltered() {
     // make ourselves the handler of STUN packets when they come in
-    using std::placeholders::_1;
     _nodeSocket.addUnfilteredHandler(_stunSockAddr, [this](std::unique_ptr<udt::BasePacket> packet) { processSTUNResponse(std::move(packet)); });
 }
 
diff --git a/tools/udt-test/src/UDTTest.cpp b/tools/udt-test/src/UDTTest.cpp
index 4b12c97f7c..9a828ebafb 100644
--- a/tools/udt-test/src/UDTTest.cpp
+++ b/tools/udt-test/src/UDTTest.cpp
@@ -176,7 +176,6 @@ UDTTest::UDTTest(int& argc, char** argv) :
     } else {
         // 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(
             [this](std::unique_ptr<udt::PacketList> packetList) { handlePacketList(std::move(packetList)); });
     }