From 7cef5eeeec0cf31d05bd3905451d7251aea20ba5 Mon Sep 17 00:00:00 2001 From: wangyix Date: Wed, 18 Jun 2014 10:27:02 -0700 Subject: [PATCH] replaced UINT16_MAX at 2 other places --- assignment-client/src/octree/OctreeInboundPacketProcessor.cpp | 3 ++- libraries/octree/src/OctreeSceneStats.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp index 6bc085df4b..b13f3d7096 100644 --- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp +++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp @@ -9,6 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#include #include #include @@ -267,7 +268,7 @@ SingleSenderStats::SingleSenderStats() void SingleSenderStats::trackInboundPacket(unsigned short int incomingSequence, quint64 transitTime, int editsInPacket, quint64 processTime, quint64 lockWaitTime) { - const int UINT16_RANGE = UINT16_MAX + 1; + const int UINT16_RANGE = std::numeric_limits::max() + 1; const int MAX_REASONABLE_SEQUENCE_GAP = 1000; // this must be less than UINT16_RANGE / 2 for rollover handling to work const int MAX_MISSING_SEQUENCE_SIZE = 100; diff --git a/libraries/octree/src/OctreeSceneStats.cpp b/libraries/octree/src/OctreeSceneStats.cpp index 1ed078ed14..d037ec79ad 100644 --- a/libraries/octree/src/OctreeSceneStats.cpp +++ b/libraries/octree/src/OctreeSceneStats.cpp @@ -9,6 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#include #include #include @@ -877,7 +878,7 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet, return; // ignore any packets that are unreasonable } - const int UINT16_RANGE = UINT16_MAX + 1; + const int UINT16_RANGE = std::numeric_limits::max() + 1; // determine our expected sequence number... handle rollover appropriately OCTREE_PACKET_SEQUENCE expected = _incomingPacket > 0 ? _incomingLastSequence + (quint16)1 : sequence;