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

clean up casts and types to fix warnings in a cleaner way

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-03-14 17:43:55 -07:00
parent 8968cf4af3
commit 711e6ca3f5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/octree/src/OctreeSceneStats.cpp
View file

@ -919,13 +919,13 @@ void OctreeSceneStats::trackIncomingOctreePacket(const QByteArray& packet,
if (wantExtraDebugging) { if (wantExtraDebugging) {
qDebug() << "too many _missingSequenceNumbers:" << _missingSequenceNumbers.size(); qDebug() << "too many _missingSequenceNumbers:" << _missingSequenceNumbers.size();
} }
foreach(unsigned int missingItem, _missingSequenceNumbers) { foreach(uint16_t missingItem, _missingSequenceNumbers) {
if (wantExtraDebugging) { if (wantExtraDebugging) {
qDebug() << "checking item:" << missingItem << "is it in need of pruning?"; qDebug() << "checking item:" << missingItem << "is it in need of pruning?";
qDebug() << "(_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE):" qDebug() << "(_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE):"
<< (_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE); << (_incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE);
} }
if (missingItem <= (unsigned int)std::max(0, (int)_incomingLastSequence - (int)MAX_MISSING_SEQUENCE_OLD_AGE)) { if (missingItem <= std::max(0, _incomingLastSequence - MAX_MISSING_SEQUENCE_OLD_AGE)) {
if (wantExtraDebugging) { if (wantExtraDebugging) {
qDebug() << "pruning really old missing sequence:" << missingItem; qDebug() << "pruning really old missing sequence:" << missingItem;
} }

2
libraries/octree/src/OctreeSceneStats.h
View file

@ -269,7 +269,7 @@ private:
unsigned int _incomingLate; /// out of order later than expected unsigned int _incomingLate; /// out of order later than expected
unsigned int _incomingReallyLate; /// out of order and later than MAX_MISSING_SEQUENCE_OLD_AGE late unsigned int _incomingReallyLate; /// out of order and later than MAX_MISSING_SEQUENCE_OLD_AGE late
unsigned int _incomingPossibleDuplicate; /// out of order possibly a duplicate unsigned int _incomingPossibleDuplicate; /// out of order possibly a duplicate
QSet<unsigned int> _missingSequenceNumbers; QSet<uint16_t> _missingSequenceNumbers;
SimpleMovingAverage _incomingFlightTimeAverage; SimpleMovingAverage _incomingFlightTimeAverage;
// features related items // features related items