Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 11:24:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #47 from Atlante45/protocol

Browse source 
Win build fixes
This commit is contained in:
Ryan Huffman 2015-09-01 11:56:23 -07:00
commit a7cae75efc
4 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/AssetClient.cpp
View file

@ -155,7 +155,7 @@ void AssetClient::handleAssetGetInfoReply(QSharedPointer<NLPacket> packet, Share
AssetInfo info { assetHash.toHex(), 0 }; AssetInfo info { assetHash.toHex(), 0 };
if (error == NO_ERROR) { if (error == AssetServerError::NoError) {
packet->readPrimitive(&info.size); packet->readPrimitive(&info.size);
} }

2
libraries/networking/src/udt/BasePacket.h
View file

@ -14,6 +14,8 @@
#ifndef hifi_BasePacket_h #ifndef hifi_BasePacket_h
#define hifi_BasePacket_h #define hifi_BasePacket_h
#include <memory>
#include <QtCore/QIODevice> #include <QtCore/QIODevice>
#include "../HifiSockAddr.h" #include "../HifiSockAddr.h"

1
libraries/networking/src/udt/CongestionControl.h
View file

@ -14,6 +14,7 @@
#include <chrono> #include <chrono>
#include <vector> #include <vector>
#include <memory>
#include "LossList.h" #include "LossList.h"
#include "SequenceNumber.h" #include "SequenceNumber.h"

1
libraries/networking/src/udt/SendQueue.h
View file

@ -12,6 +12,7 @@
#ifndef hifi_SendQueue_h #ifndef hifi_SendQueue_h
#define hifi_SendQueue_h #define hifi_SendQueue_h
#include <atomic>
#include <chrono> #include <chrono>
#include <condition_variable> #include <condition_variable>
#include <list> #include <list>