From fca23cc69bc23e348473f985d58b1f3058f1eb92 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 7 Jul 2015 12:14:40 -0700
Subject: [PATCH] make SentPacketHistory use NLPacket

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

diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp
index c7fd6090cf..88561aad6d 100644
--- a/assignment-client/src/octree/OctreeQueryNode.cpp
+++ b/assignment-client/src/octree/OctreeQueryNode.cpp
@@ -365,10 +365,10 @@ bool OctreeQueryNode::hasNextNackedPacket() const {
     return !_nackedSequenceNumbers.isEmpty();
 }
 
-NLPacket&& OctreeQueryNode::getNextNackedPacket() {
+NLPacket* OctreeQueryNode::getNextNackedPacket() {
     if (!_nackedSequenceNumbers.isEmpty()) {
         // could return null if packet is not in the history
-        return std::move(_sentPacketHistory.getPacket(_nackedSequenceNumbers.dequeue()));
+        return _sentPacketHistory.getPacket(_nackedSequenceNumbers.dequeue());
     }
 
     return nullptr;
diff --git a/assignment-client/src/octree/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h
index 9838f3b737..d2ab07360a 100644
--- a/assignment-client/src/octree/OctreeQueryNode.h
+++ b/assignment-client/src/octree/OctreeQueryNode.h
@@ -111,7 +111,7 @@ public:
 
     void parseNackPacket(const QByteArray& packet);
     bool hasNextNackedPacket() const;
-    NLPacket&& getNextNackedPacket();
+    NLPacket* getNextNackedPacket();
 
 private slots:
     void sendThreadFinished();
diff --git a/libraries/networking/src/SentPacketHistory.cpp b/libraries/networking/src/SentPacketHistory.cpp
index 8eedf2de05..3b0958f1ea 100644
--- a/libraries/networking/src/SentPacketHistory.cpp
+++ b/libraries/networking/src/SentPacketHistory.cpp
@@ -20,7 +20,7 @@ SentPacketHistory::SentPacketHistory(int size)
 
 }
 
-void SentPacketHistory::packetSent(uint16_t sequenceNumber, const QByteArray& 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
@@ -30,7 +30,7 @@ void SentPacketHistory::packetSent(uint16_t sequenceNumber, const QByteArray& pa
             << "Expected:" << expectedSequenceNumber << "Actual:" << sequenceNumber;
     }
     _newestSequenceNumber = sequenceNumber;
-    _sentPackets.insert(packet);
+    _sentPackets.insert(new NLPacket(packet));
 }
 
 const QByteArray* SentPacketHistory::getPacket(uint16_t sequenceNumber) const {
diff --git a/libraries/networking/src/SentPacketHistory.h b/libraries/networking/src/SentPacketHistory.h
index e07b128e4a..fe47d477cb 100644
--- a/libraries/networking/src/SentPacketHistory.h
+++ b/libraries/networking/src/SentPacketHistory.h
@@ -26,7 +26,7 @@ public:
     const QByteArray* getPacket(uint16_t sequenceNumber) const;
 
 private:
-    RingBufferHistory<NLPacket> _sentPackets;    // circular buffer
+    RingBufferHistory<NLPacket*> _sentPackets;    // circular buffer
 
     uint16_t _newestSequenceNumber;
 };