From 3cc23960217a93cb2403cda36b32dff286a4399d Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 13 Jun 2017 11:26:40 -0700
Subject: [PATCH] CR
---
assignment-client/src/octree/OctreeInboundPacketProcessor.cpp | 2 +-
assignment-client/src/octree/OctreeInboundPacketProcessor.h | 2 +-
libraries/networking/src/ReceivedPacketProcessor.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
index d2fef4dfbd..04409b3b21 100644
--- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
+++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
@@ -47,7 +47,7 @@ void OctreeInboundPacketProcessor::resetStats() {
_singleSenderStats.clear();
}
-unsigned long OctreeInboundPacketProcessor::getMaxWait() const {
+uint32_t OctreeInboundPacketProcessor::getMaxWait() const {
// calculate time until next sendNackPackets()
quint64 nextNackTime = _lastNackTime + TOO_LONG_SINCE_LAST_NACK;
quint64 now = usecTimestampNow();
diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.h b/assignment-client/src/octree/OctreeInboundPacketProcessor.h
index 4611fcada0..a7fa297d24 100644
--- a/assignment-client/src/octree/OctreeInboundPacketProcessor.h
+++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.h
@@ -80,7 +80,7 @@ protected:
virtual void processPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) override;
- virtual unsigned long getMaxWait() const override;
+ virtual uint32_t getMaxWait() const override;
virtual void preProcess() override;
virtual void midProcess() override;
diff --git a/libraries/networking/src/ReceivedPacketProcessor.h b/libraries/networking/src/ReceivedPacketProcessor.h
index 5b54d4f309..f71abce1f1 100644
--- a/libraries/networking/src/ReceivedPacketProcessor.h
+++ b/libraries/networking/src/ReceivedPacketProcessor.h
@@ -20,7 +20,7 @@
class ReceivedPacketProcessor : public GenericThread {
Q_OBJECT
public:
- static const unsigned long MAX_WAIT_TIME { 100 };
+ static const uint64_t MAX_WAIT_TIME { 100 }; // Max wait time in ms
ReceivedPacketProcessor();
@@ -66,7 +66,7 @@ protected:
virtual bool process() override;
/// Determines the timeout of the wait when there are no packets to process. Default value is 100ms to allow for regular event processing.
- virtual unsigned long getMaxWait() const { return MAX_WAIT_TIME; }
+ virtual uint32_t getMaxWait() const { return MAX_WAIT_TIME; }
/// Override to do work before the packets processing loop. Default does nothing.
virtual void preProcess() { }