Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use defined value for invalid sequence number

Browse source
This commit is contained in:
Simon Walton 2018-08-01 10:10:45 -07:00
parent ed75fe673e
commit b18c1f0e1e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/octree/OctreePacketProcessor.cpp
View file

@ -126,7 +126,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
} }
void OctreePacketProcessor::resetCompletionSequenceNumber() { void OctreePacketProcessor::resetCompletionSequenceNumber() {
_completionSequenceNumber = -1; _completionSequenceNumber = INVALID_SEQUENCE;
} }
namespace { namespace {
@ -141,6 +141,6 @@ namespace {
bool OctreePacketProcessor::octreeSequenceIsComplete(int sequenceNumber) const { bool OctreePacketProcessor::octreeSequenceIsComplete(int sequenceNumber) const {
// If we've received the flagged seq # and the current one is >= it. // If we've received the flagged seq # and the current one is >= it.
return _completionSequenceNumber != -1 && return _completionSequenceNumber != INVALID_SEQUENCE &&
!lessThanWraparound<OCTREE_PACKET_SEQUENCE>(sequenceNumber, _completionSequenceNumber); !lessThanWraparound<OCTREE_PACKET_SEQUENCE>(sequenceNumber, _completionSequenceNumber);
} }

3
interface/src/octree/OctreePacketProcessor.h
View file

@ -37,7 +37,8 @@ private slots:
void handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode); void handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
private: private:
std::atomic<int> _completionSequenceNumber { -1 }; static constexpr int INVALID_SEQUENCE = -1;
std::atomic<int> _completionSequenceNumber { INVALID_SEQUENCE };
}; };
#endif // hifi_OctreePacketProcessor_h #endif // hifi_OctreePacketProcessor_h