Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 01:09:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compile fixes

Browse source
This commit is contained in:
Atlante45 2015-07-07 18:22:06 -07:00
parent 5d95a5c117
commit 737d85c597
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/networking/src/NodeList.cpp
View file

@ -583,9 +583,8 @@ void NodeList::parseNodeFromPacketStream(QDataStream& packetStream) {
void NodeList::sendAssignment(Assignment& assignment) { void NodeList::sendAssignment(Assignment& assignment) {
PacketType::Value assignmentPacketType = assignment.getCommand() == Assignment::CreateCommand PacketType::Value assignmentPacketType = assignment.getCommand() == Assignment::CreateCommand ?
? PacketTypeCreateAssignment PacketType::CreateAssignment : PacketType::RequestAssignment;
: PacketTypeRequestAssignment;
QByteArray packet = byteArrayWithPopulatedHeader(assignmentPacketType); QByteArray packet = byteArrayWithPopulatedHeader(assignmentPacketType);
QDataStream packetStream(&packet, QIODevice::Append); QDataStream packetStream(&packet, QIODevice::Append);

2
libraries/shared/src/RingBufferHistory.h
View file

@ -216,7 +216,7 @@ public:
if (endAtIndex < 0) { if (endAtIndex < 0) {
endAtIndex += _size; endAtIndex += _size;
} }
return Iterator(&_buffer.first(), &_buffer.last(), &_buffer[_newestEntryAtIndex], &_buffer[endAtIndex]); return Iterator(&_buffer.front(), &_buffer.back(), &_buffer[_newestEntryAtIndex], &_buffer[endAtIndex]);
} }
}; };