From f039851f13546d877d4179e386282419d6a3b452 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 17 Aug 2015 16:57:42 -0700 Subject: [PATCH] remove std namespacing from Connection --- libraries/networking/src/udt/Connection.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp index c26e758050..e07d987c4a 100644 --- a/libraries/networking/src/udt/Connection.cpp +++ b/libraries/networking/src/udt/Connection.cpp @@ -22,10 +22,9 @@ #include "Socket.h" using namespace udt; -using namespace std; using namespace std::chrono; -Connection::Connection(Socket* parentSocket, HifiSockAddr destination, unique_ptr congestionControl) : +Connection::Connection(Socket* parentSocket, HifiSockAddr destination, std::unique_ptr congestionControl) : _parentSocket(parentSocket), _destination(destination), _congestionControl(move(congestionControl)) @@ -71,7 +70,7 @@ SendQueue& Connection::getSendQueue() { return *_sendQueue; } -void Connection::sendReliablePacket(unique_ptr packet) { +void Connection::sendReliablePacket(std::unique_ptr packet) { Q_ASSERT_X(packet->isReliable(), "Connection::send", "Trying to send an unreliable packet reliably."); getSendQueue().queuePacket(move(packet)); } @@ -346,7 +345,7 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in return wasDuplicate; } -void Connection::processControl(unique_ptr controlPacket) { +void Connection::processControl(std::unique_ptr controlPacket) { // Simple dispatch to control packets processing methods based on their type switch (controlPacket->getType()) { case ControlPacket::ACK: