From 737d85c59798626ece6924c04a76a6903e270f1c Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 7 Jul 2015 18:22:06 -0700 Subject: [PATCH] Compile fixes --- libraries/networking/src/NodeList.cpp | 5 ++--- libraries/shared/src/RingBufferHistory.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 95cad20a15..65dae052f7 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -583,9 +583,8 @@ void NodeList::parseNodeFromPacketStream(QDataStream& packetStream) { void NodeList::sendAssignment(Assignment& assignment) { - PacketType::Value assignmentPacketType = assignment.getCommand() == Assignment::CreateCommand - ? PacketTypeCreateAssignment - : PacketTypeRequestAssignment; + PacketType::Value assignmentPacketType = assignment.getCommand() == Assignment::CreateCommand ? + PacketType::CreateAssignment : PacketType::RequestAssignment; QByteArray packet = byteArrayWithPopulatedHeader(assignmentPacketType); QDataStream packetStream(&packet, QIODevice::Append); diff --git a/libraries/shared/src/RingBufferHistory.h b/libraries/shared/src/RingBufferHistory.h index 528d451d76..60b9f2caad 100644 --- a/libraries/shared/src/RingBufferHistory.h +++ b/libraries/shared/src/RingBufferHistory.h @@ -216,7 +216,7 @@ public: if (endAtIndex < 0) { endAtIndex += _size; } - return Iterator(&_buffer.first(), &_buffer.last(), &_buffer[_newestEntryAtIndex], &_buffer[endAtIndex]); + return Iterator(&_buffer.front(), &_buffer.back(), &_buffer[_newestEntryAtIndex], &_buffer[endAtIndex]); } };