Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 13:07:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove std namespacing from Connection

Browse source
This commit is contained in:
Stephen Birarda 2015-08-17 16:57:42 -07:00
parent 75e7de3019
commit f039851f13
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/networking/src/udt/Connection.cpp
View file

@ -22,10 +22,9 @@
#include "Socket.h" #include "Socket.h"
using namespace udt; using namespace udt;
using namespace std;
using namespace std::chrono; using namespace std::chrono;
Connection::Connection(Socket* parentSocket, HifiSockAddr destination, unique_ptr<CongestionControl> congestionControl) : Connection::Connection(Socket* parentSocket, HifiSockAddr destination, std::unique_ptr<CongestionControl> congestionControl) :
_parentSocket(parentSocket), _parentSocket(parentSocket),
_destination(destination), _destination(destination),
_congestionControl(move(congestionControl)) _congestionControl(move(congestionControl))
@ -71,7 +70,7 @@ SendQueue& Connection::getSendQueue() {
return *_sendQueue; return *_sendQueue;
} }
void Connection::sendReliablePacket(unique_ptr<Packet> packet) { void Connection::sendReliablePacket(std::unique_ptr<Packet> packet) {
Q_ASSERT_X(packet->isReliable(), "Connection::send", "Trying to send an unreliable packet reliably."); Q_ASSERT_X(packet->isReliable(), "Connection::send", "Trying to send an unreliable packet reliably.");
getSendQueue().queuePacket(move(packet)); getSendQueue().queuePacket(move(packet));
} }
@ -346,7 +345,7 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
return wasDuplicate; return wasDuplicate;
} }
void Connection::processControl(unique_ptr<ControlPacket> controlPacket) { void Connection::processControl(std::unique_ptr<ControlPacket> controlPacket) {
// Simple dispatch to control packets processing methods based on their type // Simple dispatch to control packets processing methods based on their type
switch (controlPacket->getType()) { switch (controlPacket->getType()) {
case ControlPacket::ACK: case ControlPacket::ACK: