From 8b71462dc14c499f2a33c9d95b96f13d1c6d3476 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 28 Jul 2015 10:36:00 -0700 Subject: [PATCH] Remove unnecessary headers --- libraries/gpu/src/gpu/State.h | 1 - libraries/networking/src/udt/Connection.cpp | 9 +++------ libraries/octree/src/OctreeEditPacketSender.h | 10 +++++----- tests/render-utils/src/main.cpp | 1 - tests/ui/src/main.cpp | 1 - 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/libraries/gpu/src/gpu/State.h b/libraries/gpu/src/gpu/State.h index 39cad1445f..ac350b0f5f 100755 --- a/libraries/gpu/src/gpu/State.h +++ b/libraries/gpu/src/gpu/State.h @@ -15,7 +15,6 @@ #include #include -#include #include // Why a macro and not a fancy template you will ask me ? diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp index d12f2b9fdb..386ad13bb6 100644 --- a/libraries/networking/src/udt/Connection.cpp +++ b/libraries/networking/src/udt/Connection.cpp @@ -152,18 +152,15 @@ void Connection::processReceivedSeqNum(SeqNum seq) { void Connection::processControl(unique_ptr controlPacket) { switch (controlPacket->getType()) { - case ControlPacket::ACK: { + case ControlPacket::ACK: processACK(move(controlPacket)); break; - } - case ControlPacket::ACK2: { + case ControlPacket::ACK2: processACK2(move(controlPacket)); break; - } - case ControlPacket::NAK: { + case ControlPacket::NAK: processNAK(move(controlPacket)); break; - } case ControlPacket::PacketPair: { break; diff --git a/libraries/octree/src/OctreeEditPacketSender.h b/libraries/octree/src/OctreeEditPacketSender.h index be44aec88d..d10870a221 100644 --- a/libraries/octree/src/OctreeEditPacketSender.h +++ b/libraries/octree/src/OctreeEditPacketSender.h @@ -12,19 +12,19 @@ #ifndef hifi_OctreeEditPacketSender_h #define hifi_OctreeEditPacketSender_h +#include + #include #include #include "JurisdictionMap.h" #include "SentPacketHistory.h" -namespace std { - template <> struct hash { +template <> struct std::hash { size_t operator()(const QUuid& uuid) const { - return qHash(uuid); + return qHash(uuid); } - }; -} +}; /// Utility for processing, packing, queueing and sending of outbound edit messages. class OctreeEditPacketSender : public PacketSender { diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp index 3b7eb18368..0806e0b6df 100644 --- a/tests/render-utils/src/main.cpp +++ b/tests/render-utils/src/main.cpp @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/tests/ui/src/main.cpp b/tests/ui/src/main.cpp index f5647bd176..fa45e807ae 100644 --- a/tests/ui/src/main.cpp +++ b/tests/ui/src/main.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include