From 922d6413d539ed8bd3721655ab9be87bc18c59f6 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 9 Jul 2015 11:21:27 -0700
Subject: [PATCH] change some const unique_ptr to const NLPacket

---
 assignment-client/src/octree/OctreeQueryNode.cpp | 2 +-
 assignment-client/src/octree/OctreeQueryNode.h   | 2 +-
 libraries/networking/src/SentPacketHistory.cpp   | 6 +++---
 libraries/networking/src/SentPacketHistory.h     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp
index 43d6ea9ba6..173c1dd840 100644
--- a/assignment-client/src/octree/OctreeQueryNode.cpp
+++ b/assignment-client/src/octree/OctreeQueryNode.cpp
@@ -356,7 +356,7 @@ void OctreeQueryNode::dumpOutOfView() {
     }
 }
 
-void OctreeQueryNode::packetSent(const std::unique_ptr<NLPacket>& packet) {
+void OctreeQueryNode::packetSent(const NLPacket& packet) {
     _sentPacketHistory.packetSent(_sequenceNumber, packet);
     _sequenceNumber++;
 }
diff --git a/assignment-client/src/octree/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h
index 3dfe2ad931..045600fd98 100644
--- a/assignment-client/src/octree/OctreeQueryNode.h
+++ b/assignment-client/src/octree/OctreeQueryNode.h
@@ -105,7 +105,7 @@ public:
     bool isShuttingDown() const { return _isShuttingDown; }
 
     void octreePacketSent() { packetSent(_octreePacket); }
-    void packetSent(const std::unique_ptr<NLPacket>& packet);
+    void packetSent(const NLPacket& packet);
 
     OCTREE_PACKET_SEQUENCE getSequenceNumber() const { return _sequenceNumber; }
 
diff --git a/libraries/networking/src/SentPacketHistory.cpp b/libraries/networking/src/SentPacketHistory.cpp
index 770973f8d8..4717970c2a 100644
--- a/libraries/networking/src/SentPacketHistory.cpp
+++ b/libraries/networking/src/SentPacketHistory.cpp
@@ -24,7 +24,7 @@ SentPacketHistory::SentPacketHistory(int size)
 
 }
 
-void SentPacketHistory::packetSent(uint16_t sequenceNumber, const std::unique_ptr<NLPacket>& packet) {
+void SentPacketHistory::packetSent(uint16_t sequenceNumber, const NLPacket& packet) {
 
     // check if given seq number has the expected value.  if not, something's wrong with
     // the code calling this function
@@ -38,7 +38,7 @@ void SentPacketHistory::packetSent(uint16_t sequenceNumber, const std::unique_pt
     _sentPackets.insert(NLPacket::createCopy(packet));
 }
 
-const std::unique_ptr<NLPacket>& SentPacketHistory::getPacket(uint16_t sequenceNumber) const {
+const NLPacket& SentPacketHistory::getPacket(uint16_t sequenceNumber) const {
 
     const int UINT16_RANGE = std::numeric_limits<uint16_t>::max() + 1;
 
@@ -49,5 +49,5 @@ const std::unique_ptr<NLPacket>& SentPacketHistory::getPacket(uint16_t sequenceN
         seqDiff += UINT16_RANGE;
     }
 
-    return *_sentPackets.get(seqDiff);
+    return *_sentPackets.get(seqDiff).get();
 }
diff --git a/libraries/networking/src/SentPacketHistory.h b/libraries/networking/src/SentPacketHistory.h
index ad03f87f88..e9ba58d4ef 100644
--- a/libraries/networking/src/SentPacketHistory.h
+++ b/libraries/networking/src/SentPacketHistory.h
@@ -24,8 +24,8 @@ class SentPacketHistory {
 public:
     SentPacketHistory(int size = MAX_REASONABLE_SEQUENCE_GAP);
 
-    void packetSent(uint16_t sequenceNumber, const std::unique_ptr<NLPacket>& packet);
-    const std::unique_ptr<NLPacket>& getPacket(uint16_t sequenceNumber) const;
+    void packetSent(uint16_t sequenceNumber, const NLPacket& packet);
+    const NLPacket& getPacket(uint16_t sequenceNumber) const;
 
 private:
     RingBufferHistory<std::unique_ptr<NLPacket>> _sentPackets;    // circular buffer