Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 13:15:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Win build fix

Browse source
This commit is contained in:
Atlante45 2015-09-11 00:09:55 +02:00
parent 18a696d88c
commit 0037a1f4a7
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
domain-server/src/DomainServerNodeData.cpp
View file

@ -54,16 +54,13 @@ QJsonObject DomainServerNodeData::overrideValuesIfNeeded(const QJsonObject& newS
QJsonArray DomainServerNodeData::overrideValuesIfNeeded(const QJsonArray& newStats) { QJsonArray DomainServerNodeData::overrideValuesIfNeeded(const QJsonArray& newStats) {
QJsonArray result; QJsonArray result;
for (int i = 0; i < newStats.size(); ++i) { for (const auto& value : newStats) {
const auto& value = newStats[i];
if (value.isObject()) { if (value.isObject()) {
result.push_back(overrideValuesIfNeeded(value.toObject())); result.push_back(overrideValuesIfNeeded(value.toObject()));
} else if (value.isArray()) { } else if (value.isArray()) {
result.push_back(overrideValuesIfNeeded(value.toArray())); result.push_back(overrideValuesIfNeeded(value.toArray()));
} else { } else {
result.push_back(newStats[i]); result.push_back(value);
} }
} }
return result; return result;

3
libraries/networking/src/udt/PacketList.h
View file

@ -61,7 +61,8 @@ protected:
PacketList(PacketList&& other); PacketList(PacketList&& other);
virtual qint64 writeData(const char* data, qint64 maxSize); 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; PacketType _packetType;
std::list<std::unique_ptr<Packet>> _packets; std::list<std::unique_ptr<Packet>> _packets;