From 0037a1f4a7186062cbabbdbbe9b158e626275711 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 11 Sep 2015 00:09:55 +0200 Subject: [PATCH] Win build fix --- domain-server/src/DomainServerNodeData.cpp | 7 ++----- libraries/networking/src/udt/PacketList.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/domain-server/src/DomainServerNodeData.cpp b/domain-server/src/DomainServerNodeData.cpp index 3dd9a1998a..521406ad5c 100644 --- a/domain-server/src/DomainServerNodeData.cpp +++ b/domain-server/src/DomainServerNodeData.cpp @@ -54,16 +54,13 @@ QJsonObject DomainServerNodeData::overrideValuesIfNeeded(const QJsonObject& newS QJsonArray DomainServerNodeData::overrideValuesIfNeeded(const QJsonArray& newStats) { QJsonArray result; - for (int i = 0; i < newStats.size(); ++i) { - const auto& value = newStats[i]; - + for (const auto& value : newStats) { if (value.isObject()) { - result.push_back(overrideValuesIfNeeded(value.toObject())); } else if (value.isArray()) { result.push_back(overrideValuesIfNeeded(value.toArray())); } else { - result.push_back(newStats[i]); + result.push_back(value); } } return result; diff --git a/libraries/networking/src/udt/PacketList.h b/libraries/networking/src/udt/PacketList.h index bcf13ad954..ae783dabe3 100644 --- a/libraries/networking/src/udt/PacketList.h +++ b/libraries/networking/src/udt/PacketList.h @@ -61,7 +61,8 @@ protected: PacketList(PacketList&& other); virtual qint64 writeData(const char* data, qint64 maxSize); - virtual qint64 readData(char* data, qint64 maxSize) { Q_ASSERT(false); } + // Not implemented, added an assert so that it doesn't get used by accident + virtual qint64 readData(char* data, qint64 maxSize) { Q_ASSERT(false); return 0; } PacketType _packetType; std::list> _packets;